Removing a dependency on chrome/common/pref_names.h from chromeos/drive.

To reuse chrome/browser/chromeos/drive/... in a non-browser process, we
need to remove the dependency on chrome/common/pref_names.h.  This is
most important for file_system.cc and job_scheduler.cc.

The dependency on chrome/common/pref_names.h can remain intact in
drive_integration_service.cc and browser-specific part of
file_system_util.cc, because they don't impact re-use of
drive::FileSystem and its dependencies.

The dependency on chrome/common/pref_names.h is removed elsewhere by
moving drive-specific pref names from chrome/common/pref_names.h to
chrome/browser/chromeos/drive/drive_pref_names.h and cleaning up code
that depended on the old header and namespace of the constants.

Test steps:
$ GYP_DEFINES="use_goma=1 gomadir=/usr/local/google/home/lukasza/goma chromeos=1" gclient sync
$ ninja -C out/Debug -j 150 unit_tests
$ out/Debug/unit_tests

BUG=498951
TEST=Please see "Test steps" above.

Review URL: https://codereview.chromium.org/1188563004

Cr-Commit-Position: refs/heads/master@{#334837}

19 files changed, 82 insertions, 45 deletions

diff --git a/chrome/browser/chromeos/drive/drive_integration_service.cc b/chrome/browser/chromeos/drive/drive_integration_service.cc
index b470d0f..da85677 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/drive/debug_info_collector.h"
 #include "chrome/browser/chromeos/drive/download_handler.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -554,9 +555,9 @@ void DriveIntegrationService::InitializeAfterMetadataInitialized(
 void DriveIntegrationService::AvoidDriveAsDownloadDirecotryPreference() {
   PrefService* pref_service = profile_->GetPrefs();
   if (util::IsUnderDriveMountPoint(
-          pref_service->GetFilePath(prefs::kDownloadDefaultDirectory))) {
+          pref_service->GetFilePath(::prefs::kDownloadDefaultDirectory))) {
     pref_service->SetFilePath(
-        prefs::kDownloadDefaultDirectory,
+        ::prefs::kDownloadDefaultDirectory,
         file_manager::util::GetDownloadsFolderForProfile(profile_));
   }
 }
diff --git a/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc b/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc
index c39bcbc..ee26fda 100644
--- a/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc
+++ b/chrome/browser/chromeos/drive/drive_integration_service_browsertest.cc
@@ -5,9 +5,9 @@
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 
 #include "base/prefs/pref_service.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/drive_pref_names.cc b/chrome/browser/chromeos/drive/drive_pref_names.cc
new file mode 100644
index 0000000..7ec379f
--- /dev/null
+++ b/chrome/browser/chromeos/drive/drive_pref_names.cc
@@ -0,0 +1,23 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
+
+namespace drive {
+namespace prefs {
+
+// A boolean pref to disable Google Drive integration.
+// The pref prefix should remain as "gdata" for backward compatibility.
+const char kDisableDrive[] = "gdata.disabled";
+
+// A boolean pref to disable Drive over cellular connections.
+// The pref prefix should remain as "gdata" for backward compatibility.
+const char kDisableDriveOverCellular[] = "gdata.cellular.disabled";
+
+// A boolean pref to disable hosted files on Drive.
+// The pref prefix should remain as "gdata" for backward compatibility.
+const char kDisableDriveHostedFiles[] = "gdata.hosted_files.disabled";
+
+}  // namespace prefs
+}  // namespace drive
diff --git a/chrome/browser/chromeos/drive/drive_pref_names.h b/chrome/browser/chromeos/drive/drive_pref_names.h
new file mode 100644
index 0000000..9eec417
--- /dev/null
+++ b/chrome/browser/chromeos/drive/drive_pref_names.h
@@ -0,0 +1,20 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Constants for the names of preferences related to Google Drive.
+
+#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PREF_NAMES_H_
+#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PREF_NAMES_H_
+
+namespace drive {
+namespace prefs {
+
+extern const char kDisableDrive[];
+extern const char kDisableDriveOverCellular[];
+extern const char kDisableDriveHostedFiles[];
+
+}  // namespace prefs
+}  // namespace drive
+
+#endif  // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_PREF_NAMES_H_
diff --git a/chrome/browser/chromeos/drive/file_system.cc b/chrome/browser/chromeos/drive/file_system.cc
index 7e04eec..fd97a58 100644
--- a/chrome/browser/chromeos/drive/file_system.cc
+++ b/chrome/browser/chromeos/drive/file_system.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/chromeos/drive/change_list_loader.h"
 #include "chrome/browser/chromeos/drive/directory_loader.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_cache.h"
 #include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"
@@ -31,7 +32,6 @@
 #include "chrome/browser/chromeos/drive/resource_entry_conversion.h"
 #include "chrome/browser/chromeos/drive/search_metadata.h"
 #include "chrome/browser/chromeos/drive/sync_client.h"
-#include "chrome/common/pref_names.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/file_system_util.cc b/chrome/browser/chromeos/drive/file_system_util.cc
index 19f45af..d339124 100644
--- a/chrome/browser/chromeos/drive/file_system_util.cc
+++ b/chrome/browser/chromeos/drive/file_system_util.cc
@@ -25,6 +25,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/drive/write_on_cache_file.h"
diff --git a/chrome/browser/chromeos/drive/job_scheduler.cc b/chrome/browser/chromeos/drive/job_scheduler.cc
index f5c749a..fa9d9fb 100644
--- a/chrome/browser/chromeos/drive/job_scheduler.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler.cc
@@ -13,8 +13,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/drive/event_logger.h"
-#include "chrome/common/pref_names.h"
 #include "google_apis/drive/drive_api_parser.h"
 
 namespace drive {
diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
index a645c54..9a775c0 100644
--- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
+++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc
@@ -15,11 +15,11 @@
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "chrome/browser/drive/fake_drive_service.h"
 #include "chrome/browser/drive/test_util.h"
-#include "chrome/common/pref_names.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/drive/drive_api_parser.h"
 #include "google_apis/drive/test_util.h"
diff --git a/chrome/browser/chromeos/drive/test_util.cc b/chrome/browser/chromeos/drive/test_util.cc
index 682f62d..644fb84 100644
--- a/chrome/browser/chromeos/drive/test_util.cc
+++ b/chrome/browser/chromeos/drive/test_util.cc
@@ -7,7 +7,7 @@
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
-#include "chrome/common/pref_names.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 
 namespace drive {
 namespace test_util {
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
index a1e42a3..14efa96 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -15,6 +15,7 @@
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_change.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
@@ -435,9 +436,10 @@ void EventRouter::ObserveEvents() {
   base::Closure callback =
       base::Bind(&EventRouter::OnFileManagerPrefsChanged,
                  weak_factory_.GetWeakPtr());
-  pref_change_registrar_->Add(prefs::kDisableDriveOverCellular, callback);
-  pref_change_registrar_->Add(prefs::kDisableDriveHostedFiles, callback);
-  pref_change_registrar_->Add(prefs::kDisableDrive, callback);
+  pref_change_registrar_->Add(drive::prefs::kDisableDriveOverCellular,
+                              callback);
+  pref_change_registrar_->Add(drive::prefs::kDisableDriveHostedFiles, callback);
+  pref_change_registrar_->Add(drive::prefs::kDisableDrive, callback);
   pref_change_registrar_->Add(prefs::kSearchSuggestEnabled, callback);
   pref_change_registrar_->Add(prefs::kUse24HourClock, callback);
 }
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 6edc2a2..d63f7f3 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -13,6 +13,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
@@ -114,9 +115,9 @@ bool FileManagerPrivateGetPreferencesFunction::RunSync() {
 
   result.drive_enabled = drive::util::IsDriveEnabledForProfile(GetProfile());
   result.cellular_disabled =
-      service->GetBoolean(prefs::kDisableDriveOverCellular);
+      service->GetBoolean(drive::prefs::kDisableDriveOverCellular);
   result.hosted_files_disabled =
-      service->GetBoolean(prefs::kDisableDriveHostedFiles);
+      service->GetBoolean(drive::prefs::kDisableDriveHostedFiles);
   result.search_suggest_enabled =
       service->GetBoolean(prefs::kSearchSuggestEnabled);
   result.use24hour_clock = service->GetBoolean(prefs::kUse24HourClock);
@@ -143,11 +144,11 @@ bool FileManagerPrivateSetPreferencesFunction::RunSync() {
   PrefService* const service = GetProfile()->GetPrefs();
 
   if (params->change_info.cellular_disabled)
-    service->SetBoolean(prefs::kDisableDriveOverCellular,
+    service->SetBoolean(drive::prefs::kDisableDriveOverCellular,
                         *params->change_info.cellular_disabled);
 
   if (params->change_info.hosted_files_disabled)
-    service->SetBoolean(prefs::kDisableDriveHostedFiles,
+    service->SetBoolean(drive::prefs::kDisableDriveHostedFiles,
                         *params->change_info.hosted_files_disabled);
 
   drive::EventLogger* logger = file_manager::util::GetLogger(GetProfile());
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 10070a8..527e6c7 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -21,6 +21,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_syncer.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
@@ -184,16 +185,13 @@ void Preferences::RegisterProfilePrefs(
       base::GetHourClockType() == base::k24HourClock,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      prefs::kDisableDrive,
-      false,
+      drive::prefs::kDisableDrive, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      prefs::kDisableDriveOverCellular,
-      true,
+      drive::prefs::kDisableDriveOverCellular, true,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   registry->RegisterBooleanPref(
-      prefs::kDisableDriveHostedFiles,
-      false,
+      drive::prefs::kDisableDriveHostedFiles, false,
       user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
   // We don't sync prefs::kLanguageCurrentInputMethod and PreviousInputMethod
   // because they're just used to track the logout state of the device.
diff --git a/chrome/browser/download/download_dir_policy_handler.cc b/chrome/browser/download/download_dir_policy_handler.cc
index 1e1bc26..42a7309 100644
--- a/chrome/browser/download/download_dir_policy_handler.cc
+++ b/chrome/browser/download/download_dir_policy_handler.cc
@@ -8,6 +8,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_value_map.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/common/pref_names.h"
@@ -108,7 +109,7 @@ void DownloadDirPolicyHandler::ApplyPolicySettingsWithParameters(
                     new base::FundamentalValue(false));
 #if defined(OS_CHROMEOS)
     if (download_to_drive) {
-      prefs->SetValue(prefs::kDisableDrive,
+      prefs->SetValue(drive::prefs::kDisableDrive,
                       new base::FundamentalValue(false));
     }
 #endif
diff --git a/chrome/browser/download/download_dir_policy_handler_unittest.cc b/chrome/browser/download/download_dir_policy_handler_unittest.cc
index 2718f13..58167a1 100644
--- a/chrome/browser/download/download_dir_policy_handler_unittest.cc
+++ b/chrome/browser/download/download_dir_policy_handler_unittest.cc
@@ -7,6 +7,7 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/download/download_dir_policy_handler.h"
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/common/pref_names.h"
@@ -106,7 +107,7 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
   EXPECT_FALSE(prompt_for_download);
 
   bool disable_drive;
-  EXPECT_TRUE(store_->GetValue(prefs::kDisableDrive, &value));
+  EXPECT_TRUE(store_->GetValue(drive::prefs::kDisableDrive, &value));
   EXPECT_TRUE(value);
   EXPECT_TRUE(value->GetAsBoolean(&disable_drive));
   EXPECT_FALSE(disable_drive);
@@ -123,7 +124,7 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
              new base::StringValue(kUserIDHash),
              NULL);
   UpdateProviderPolicy(policy);
-  EXPECT_FALSE(recommended_store_->GetValue(prefs::kDisableDrive, NULL));
+  EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
 
   policy.Set(policy::key::kDownloadDirectory,
              policy::POLICY_LEVEL_RECOMMENDED,
@@ -134,7 +135,7 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
   UpdateProviderPolicy(policy);
 
   EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
-  EXPECT_FALSE(recommended_store_->GetValue(prefs::kDisableDrive, NULL));
+  EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
 
   EXPECT_TRUE(
       recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
@@ -151,7 +152,7 @@ TEST_F(DownloadDirPolicyHandlerTest, SetDownloadToDrive) {
   UpdateProviderPolicy(policy);
 
   EXPECT_FALSE(recommended_store_->GetValue(prefs::kPromptForDownload, NULL));
-  EXPECT_FALSE(recommended_store_->GetValue(prefs::kDisableDrive, NULL));
+  EXPECT_FALSE(recommended_store_->GetValue(drive::prefs::kDisableDrive, NULL));
 
   EXPECT_TRUE(
       recommended_store_->GetValue(prefs::kDownloadDefaultDirectory, &value));
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
index f117e04..14812ac 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -42,6 +42,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h"
 #include "chromeos/chromeos_pref_names.h"
 #include "chromeos/dbus/power_policy_controller.h"
@@ -381,10 +382,10 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
     prefs::kChromeOsReleaseChannel,
     base::Value::TYPE_STRING },
   { key::kDriveDisabled,
-    prefs::kDisableDrive,
+    drive::prefs::kDisableDrive,
     base::Value::TYPE_BOOLEAN },
   { key::kDriveDisabledOverCellular,
-    prefs::kDisableDriveOverCellular,
+    drive::prefs::kDisableDriveOverCellular,
     base::Value::TYPE_BOOLEAN },
   { key::kExternalStorageDisabled,
     prefs::kExternalStorageDisabled,
diff --git a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
index 6393213..a622860 100644
--- a/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/drive_internals_ui.cc
@@ -17,6 +17,7 @@
 #include "chrome/browser/chromeos/drive/debug_info_collector.h"
 #include "chrome/browser/chromeos/drive/drive.pb.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
+#include "chrome/browser/chromeos/drive/drive_pref_names.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/job_list.h"
 #include "chrome/browser/chromeos/file_manager/path_util.h"
@@ -455,9 +456,9 @@ void DriveInternalsWebUIHandler::UpdateDriveRelatedPreferencesSection() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const char* kDriveRelatedPreferences[] = {
-    prefs::kDisableDrive,
-    prefs::kDisableDriveOverCellular,
-    prefs::kDisableDriveHostedFiles,
+      drive::prefs::kDisableDrive,
+      drive::prefs::kDisableDriveOverCellular,
+      drive::prefs::kDisableDriveHostedFiles,
   };
 
   Profile* profile = Profile::FromWebUI(web_ui());
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 961a955..56faea3 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -110,6 +110,8 @@
         'browser/chromeos/drive/drive_file_stream_reader.h',
         'browser/chromeos/drive/drive_integration_service.cc',
         'browser/chromeos/drive/drive_integration_service.h',
+        'browser/chromeos/drive/drive_pref_names.cc',
+        'browser/chromeos/drive/drive_pref_names.h',
         'browser/chromeos/drive/file_cache.cc',
         'browser/chromeos/drive/file_cache.h',
         'browser/chromeos/drive/file_change.cc',
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index 0547b3f..67b69e7 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -472,18 +472,6 @@ const char kUse24HourClock[] = "settings.clock.use_24hour_clock";
 const char kResolveTimezoneByGeolocation[] =
     "settings.resolve_timezone_by_geolocation";
 
-// A boolean pref to disable Google Drive integration.
-// The pref prefix should remain as "gdata" for backward compatibility.
-const char kDisableDrive[] = "gdata.disabled";
-
-// A boolean pref to disable Drive over cellular connections.
-// The pref prefix should remain as "gdata" for backward compatibility.
-const char kDisableDriveOverCellular[] = "gdata.cellular.disabled";
-
-// A boolean pref to disable hosted files on Drive.
-// The pref prefix should remain as "gdata" for backward compatibility.
-const char kDisableDriveHostedFiles[] = "gdata.hosted_files.disabled";
-
 // A string pref set to the current input method.
 const char kLanguageCurrentInputMethod[] =
     "settings.language.current_input_method";
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index 785cb69..b657090 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -182,9 +182,6 @@ extern const char kMouseSensitivity[];
 extern const char kTouchpadSensitivity[];
 extern const char kUse24HourClock[];
 extern const char kResolveTimezoneByGeolocation[];
-extern const char kDisableDrive[];
-extern const char kDisableDriveOverCellular[];
-extern const char kDisableDriveHostedFiles[];
 // TODO(yusukes): Change "kLanguageABC" to "kABC". The current form is too long
 // to remember and confusing. The prefs are actually for input methods and i18n
 // keyboards, not UI languages.