[Sync] Move SyncPrefs into sync_driver component

[Sync] Move SyncPrefs into sync_driver component

This also moves all sync preferences out of the common pref_names file and into
a sync_driver specific pref_names. To allow that, the dependency on history
policy is moved into the typed_url_data_type_controller, and a dependency
on the deprecated acknowledged types pref is removed from ntp_resource_cache.

BUG=339726
R=blundell@chromium.org, mnissler@chromium.org, rlarocque@chromium.org
TBR=atwilson@chromium.org, sky@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258415

[Nicolas Zea, 2014-03-14 23:47:40]

PTAL. SyncPrefs and the typed url datatype controller are the only ones with
non-cleanup only changes

https://codereview.chromium.org/195873020/diff/1/chrome/browser/ui/webui/ntp/...
File chrome/browser/ui/webui/ntp/ntp_resource_cache.cc (left):

https://codereview.chromium.org/195873020/diff/1/chrome/browser/ui/webui/ntp/...
chrome/browser/ui/webui/ntp/ntp_resource_cache.cc:178:
profile_pref_change_registrar_.Add(prefs::kSyncAcknowledgedSyncTypes,
this code is obsolete, see bug 352818

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/sync_...
File components/sync_driver/sync_prefs.cc (left):

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/sync_...
components/sync_driver/sync_prefs.cc:234: if
(pref_service_->HasPrefPath(prefs::kSavingBrowserHistoryDisabled) &&
moved to datatype controller

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/sync_...
components/sync_driver/sync_prefs.cc:422: if
(!CommandLine::ForCurrentProcess()->HasSwitch(
obsolete

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/sync_...
File components/sync_driver/sync_prefs.h (left):

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/sync_...
components/sync_driver/sync_prefs.h:78: std::string GetGoogleServicesUsername()
const;
only had one callsite, that could just as easily query the pref directly (it's
not a sync-specific pref)

[rlarocque, 2014-03-17 20:32:22]

lgtm

[Nicolas Zea, 2014-03-17 20:46:49]

+Colin for components gypi and deps changes
+Mattias for dependency on user_prefs

[Mattias Nissler (ping if slow), 2014-03-18 08:56:49]

prefs LGTM

[blundell, 2014-03-18 09:43:26]

components_tests.gyp and components/sync_driver/DEPS LGTM with nits

Let me know if you wanted me to look at anything else.

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/DEPS
File components/sync_driver/DEPS (right):

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/DEPS#...
components/sync_driver/DEPS:5: "+components/user_prefs",
This should be "+components/user_prefs/pref_registry_syncable.h", because
"components/user_prefs/user_prefs.h" is specific to BrowserContext.

[Nicolas Zea, 2014-03-18 20:03:00]

Done. +TBR Scott and Drew for the SyncPrefs movement/namespace change,
committing via commitbot

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/DEPS
File components/sync_driver/DEPS (right):

https://codereview.chromium.org/195873020/diff/1/components/sync_driver/DEPS#...
components/sync_driver/DEPS:5: "+components/user_prefs",
On 2014/03/18 09:43:27, blundell wrote:
> This should be "+components/user_prefs/pref_registry_syncable.h", because
> "components/user_prefs/user_prefs.h" is specific to BrowserContext.

Done.

[Nicolas Zea, 2014-03-18 20:03:14]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-18 20:04:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/20001

[commit-bot: I haz the power, 2014-03-18 20:14:39]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-18 20:14:39]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_clang_dbg

[Nicolas Zea, 2014-03-18 21:46:52]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-18 21:57:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/40001

[commit-bot: I haz the power, 2014-03-18 21:58:55]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-18 21:58:56]

Failed to apply patch for chrome/browser/autocomplete/base_search_provider.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/autocomplete/base_search_provider.cc
  Hunk #2 FAILED at 560.
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/autocomplete/base_search_provider.cc.rej

Patch:       chrome/browser/autocomplete/base_search_provider.cc
Index: chrome/browser/autocomplete/base_search_provider.cc
diff --git a/chrome/browser/autocomplete/base_search_provider.cc
b/chrome/browser/autocomplete/base_search_provider.cc
index
c50ad2cedefc57be41e77caa569048264f2dfa27..58333f520e88578f6be98d86b3a5c2050f2e62b0
100644
--- a/chrome/browser/autocomplete/base_search_provider.cc
+++ b/chrome/browser/autocomplete/base_search_provider.cc
@@ -24,6 +24,7 @@
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
+#include "components/sync_driver/sync_prefs.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
@@ -559,7 +560,7 @@ bool BaseSearchProvider::CanSendURL(
   // Check field trials and settings allow sending the URL on suggest requests.
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile);
-  browser_sync::SyncPrefs sync_prefs(prefs);
+  sync_driver::SyncPrefs sync_prefs(prefs);
   if (!OmniboxFieldTrial::InZeroSuggestFieldTrial() ||
       service == NULL ||
       !service->IsSyncEnabledAndLoggedIn() ||

[Nicolas Zea, 2014-03-18 22:21:09]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-18 22:24:38]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/60001

[commit-bot: I haz the power, 2014-03-18 23:02:58]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-18 23:02:59]

Retried try job too often on win_rel for step(s) base_unittests, browser_tests,
interactive_ui_tests, net_unittests, unit_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[Nicolas Zea, 2014-03-19 20:59:41]

The CQ bit was checked by zea@chromium.org

[Nicolas Zea, 2014-03-19 21:00:40]

The CQ bit was unchecked by zea@chromium.org

[Nicolas Zea, 2014-03-19 21:09:06]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-19 21:09:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/100001

[commit-bot: I haz the power, 2014-03-19 21:09:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-19 21:09:59]

Failed to apply patch for
chrome/browser/sync/profile_sync_service_startup_unittest.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/sync/profile_sync_service_startup_unittest.cc
  Hunk #1 FAILED at 18.
  1 out of 15 hunks FAILED -- saving rejects to file
chrome/browser/sync/profile_sync_service_startup_unittest.cc.rej

Patch:       chrome/browser/sync/profile_sync_service_startup_unittest.cc
Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
index
9c8ce39ea1b6b1903737fcea218529589f2bcef8..93f921ec98f65bbad41220ad4c2b6801b0e72420
100644
--- a/chrome/browser/sync/profile_sync_service_startup_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_startup_unittest.cc
@@ -18,11 +18,12 @@
 #include "chrome/browser/sync/profile_sync_components_factory_mock.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/profile_sync_test_util.h"
-#include "chrome/browser/sync/sync_prefs.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/sync_driver/data_type_manager.h"
 #include "components/sync_driver/data_type_manager_mock.h"
+#include "components/sync_driver/pref_names.h"
+#include "components/sync_driver/sync_prefs.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -171,7 +172,7 @@ class ProfileSyncServiceStartupCrosTest : public
ProfileSyncServiceStartupTest {
 
 TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   // We've never completed startup.
-  profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
+  profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
   CreateSyncService();
   SetUpSyncBackendHost();
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
@@ -183,8 +184,11 @@ TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
   sync_->Initialize();
 
   // Preferences should be back to defaults.
-  EXPECT_EQ(0, profile_->GetPrefs()->GetInt64(prefs::kSyncLastSyncedTime));
- 
EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted));
+  EXPECT_EQ(
+      0,
+      profile_->GetPrefs()->GetInt64(sync_driver::prefs::kSyncLastSyncedTime));
+  EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(
+      sync_driver::prefs::kSyncHasSetupCompleted));
   Mock::VerifyAndClearExpectations(data_type_manager);
 
   // Then start things up.
@@ -218,7 +222,7 @@ TEST_F(ProfileSyncServiceStartupTest, StartFirstTime) {
 // TODO(pavely): Reenable test once android is switched to oauth2.
 TEST_F(ProfileSyncServiceStartupTest, DISABLED_StartNoCredentials) {
   // We've never completed startup.
-  profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
+  profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
   CreateSyncService();
 
   // Should not actually start, rather just clean things up and wait
@@ -229,8 +233,11 @@ TEST_F(ProfileSyncServiceStartupTest,
DISABLED_StartNoCredentials) {
   sync_->Initialize();
 
   // Preferences should be back to defaults.
-  EXPECT_EQ(0, profile_->GetPrefs()->GetInt64(prefs::kSyncLastSyncedTime));
- 
EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted));
+  EXPECT_EQ(
+      0,
+      profile_->GetPrefs()->GetInt64(sync_driver::prefs::kSyncLastSyncedTime));
+  EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(
+      sync_driver::prefs::kSyncHasSetupCompleted));
 
   // Then start things up.
   sync_->SetSetupInProgress(true);
@@ -303,7 +310,7 @@ TEST_F(ProfileSyncServiceStartupCrosTest,
StartCrosNoCredentials) {
               CreateDataTypeManager(_, _, _, _, _, _)).Times(0);
   EXPECT_CALL(*components_factory_mock(),
               CreateSyncBackendHost(_, _, _)).Times(0);
-  profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
+  profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
 
   sync_->Initialize();
@@ -318,7 +325,7 @@ TEST_F(ProfileSyncServiceStartupCrosTest,
StartCrosNoCredentials) {
 TEST_F(ProfileSyncServiceStartupCrosTest, StartFirstTime) {
   SetUpSyncBackendHost();
   DataTypeManagerMock* data_type_manager = SetUpDataTypeManager();
-  profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
+  profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
   EXPECT_CALL(*data_type_manager, Configure(_, _));
   EXPECT_CALL(*data_type_manager, state()).
       WillRepeatedly(Return(DataTypeManager::CONFIGURED));
@@ -356,12 +363,13 @@ TEST_F(ProfileSyncServiceStartupTest, StartNormal) {
 // therefore being left unset.
 TEST_F(ProfileSyncServiceStartupTest, StartRecoverDatatypePrefs) {
   // Clear the datatype preference fields (simulating bug 154940).
-  profile_->GetPrefs()->ClearPref(prefs::kSyncKeepEverythingSynced);
+  profile_->GetPrefs()->ClearPref(
+      sync_driver::prefs::kSyncKeepEverythingSynced);
   syncer::ModelTypeSet user_types = syncer::UserTypes();
   for (syncer::ModelTypeSet::Iterator iter = user_types.First();
        iter.Good(); iter.Inc()) {
     profile_->GetPrefs()->ClearPref(
-        browser_sync::SyncPrefs::GetPrefNameForDataType(iter.Get()));
+        sync_driver::SyncPrefs::GetPrefNameForDataType(iter.Get()));
   }
 
   // Pre load the tokens
@@ -383,7 +391,7 @@ TEST_F(ProfileSyncServiceStartupTest,
StartRecoverDatatypePrefs) {
   sync_->Initialize();
 
   EXPECT_TRUE(profile_->GetPrefs()->GetBoolean(
-      prefs::kSyncKeepEverythingSynced));
+      sync_driver::prefs::kSyncKeepEverythingSynced));
 }
 
 // Verify that the recovery of datatype preferences doesn't overwrite a valid
@@ -391,7 +399,8 @@ TEST_F(ProfileSyncServiceStartupTest,
StartRecoverDatatypePrefs) {
 TEST_F(ProfileSyncServiceStartupTest, StartDontRecoverDatatypePrefs) {
   // Explicitly set Keep Everything Synced to false and have only bookmarks
   // enabled.
-  profile_->GetPrefs()->SetBoolean(prefs::kSyncKeepEverythingSynced, false);
+  profile_->GetPrefs()->SetBoolean(
+      sync_driver::prefs::kSyncKeepEverythingSynced, false);
 
   // Pre load the tokens
   profile_->GetPrefs()->SetString(prefs::kGoogleServicesUsername,
@@ -411,7 +420,7 @@ TEST_F(ProfileSyncServiceStartupTest,
StartDontRecoverDatatypePrefs) {
   sync_->Initialize();
 
   EXPECT_FALSE(profile_->GetPrefs()->GetBoolean(
-      prefs::kSyncKeepEverythingSynced));
+      sync_driver::prefs::kSyncKeepEverythingSynced));
 }
 
 TEST_F(ProfileSyncServiceStartupTest, ManagedStartup) {
@@ -421,7 +430,7 @@ TEST_F(ProfileSyncServiceStartupTest, ManagedStartup) {
   CreateSyncService();
 
   // Disable sync through policy.
-  profile_->GetPrefs()->SetBoolean(prefs::kSyncManaged, true);
+  profile_->GetPrefs()->SetBoolean(sync_driver::prefs::kSyncManaged, true);
   EXPECT_CALL(*components_factory_mock(),
               CreateDataTypeManager(_, _, _, _, _, _)).Times(0);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
@@ -449,7 +458,7 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
       WillOnce(Return(DataTypeManager::CONFIGURED));
   EXPECT_CALL(*data_type_manager, Stop()).Times(1);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  profile_->GetPrefs()->SetBoolean(prefs::kSyncManaged, true);
+  profile_->GetPrefs()->SetBoolean(sync_driver::prefs::kSyncManaged, true);
 
   // When switching back to unmanaged, the state should change, but the service
   // should not start up automatically (kSyncSetupCompleted will be false).
@@ -457,7 +466,7 @@ TEST_F(ProfileSyncServiceStartupTest, SwitchManaged) {
   EXPECT_CALL(*components_factory_mock(),
               CreateDataTypeManager(_, _, _, _, _, _)).Times(0);
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
-  profile_->GetPrefs()->ClearPref(prefs::kSyncManaged);
+  profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncManaged);
 }
 
 TEST_F(ProfileSyncServiceStartupTest, StartFailure) {
@@ -505,7 +514,7 @@ TEST_F(ProfileSyncServiceStartupTest, StartDownloadFailed) {
   SyncBackendHostMock* mock_sbh = SetUpSyncBackendHost();
   mock_sbh->set_fail_initial_download(true);
 
-  profile_->GetPrefs()->ClearPref(prefs::kSyncHasSetupCompleted);
+  profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
 
   EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
   sync_->Initialize();

[Nicolas Zea, 2014-03-19 21:11:53]

The CQ bit was checked by zea@chromium.org

[Nicolas Zea, 2014-03-19 21:12:12]

The CQ bit was unchecked by zea@chromium.org

[Nicolas Zea, 2014-03-19 21:41:59]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-19 21:43:36]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/120001

[commit-bot: I haz the power, 2014-03-19 22:58:47]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-19 22:58:47]

Retried try job too often on android_dbg for step(s) slave_steps
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_db...

[Nicolas Zea, 2014-03-19 23:26:46]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-19 23:28:55]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/140001

[commit-bot: I haz the power, 2014-03-20 00:27:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 00:28:00]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_chromeos_clang_dbg

[Nicolas Zea, 2014-03-20 01:03:48]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-20 01:04:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/160001

[commit-bot: I haz the power, 2014-03-20 01:08:30]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 01:08:30]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_clang_dbg

[Nicolas Zea, 2014-03-20 19:43:08]

The CQ bit was checked by zea@chromium.org

[commit-bot: I haz the power, 2014-03-20 19:44:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zea@chromium.org/195873020/180001

[commit-bot: I haz the power, 2014-03-20 19:49:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-03-20 19:49:44]

Try jobs failed on following builders:
  tryserver.chromium on linux_chromium_clang_dbg

[Nicolas Zea, 2014-03-20 21:33:52]

Committed patchset #9 manually as r258415 (presubmit successful).