3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index b900bf2..5d36fe6 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -60,7 +60,7 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
       { switches::kEnablePrintPreview, prefs::kPrintPreviewDisabled, false },
 #endif
 #if defined(OS_CHROMEOS)
-      { switches::kDisableGData, prefs::kDisableGData, true },
+      { switches::kDisableDrive, prefs::kDisableGData, true },
       { switches::kEnableTouchpadThreeFingerClick,
           prefs::kEnableTouchpadThreeFingerClick, true },
 #endif
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index f305768..569056e 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -1373,15 +1373,15 @@ const char kEnableCarrierSwitching[]        = "enable-carrier-switching";
 // Disables wallpaper boot animation (except of OOBE case).
 const char kDisableBootAnimation[]          = "disable-boot-animation";
 
+// Disables Google Drive integration.
+const char kDisableDrive[]                  = "disable-drive";
+
 // Disables file prefetching in Google Drive Client for Chrome OS.
 const char kDisableDrivePrefetch[]          = "disable-drive-prefetch";
 
 // Disables reset the device to its factory state in design.
 const char kDisableFactoryReset[]           = "disable-factory-reset";
 
-// Disables gdata content provider.
-const char kDisableGData[]                  = "disable-gdata";
-
 // Disables new WebRTC implementation of user image picker.
 const char kDisableHtml5Camera[]            = "disable-html5-camera";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 04514fd..3d90e8a 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -370,9 +370,9 @@ extern const char kTabletUI[];
 extern const char kAshWebUIInit[];
 extern const char kEnableCarrierSwitching[];
 extern const char kDisableBootAnimation[];
+extern const char kDisableDrive[];
 extern const char kDisableDrivePrefetch[];
 extern const char kDisableFactoryReset[];
-extern const char kDisableGData[];
 extern const char kDisableHtml5Camera[];
 extern const char kDisableLoginAnimations[];
 extern const char kDisableNewOobe[];