[Sync] Move SyncPrefs into sync_driver component

components/sync_driver/sync_prefs.cc

 // Copyright (c) 2012 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/sync/sync_prefs.h"
+#include "components/sync_driver/sync_prefs.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/profiles/profile_io_data.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/pref_names.h"
+#include "components/sync_driver/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
 
-namespace browser_sync {
+namespace sync_driver {
 
 SyncPrefObserver::~SyncPrefObserver() {}
 
-SyncPrefs::SyncPrefs(PrefService* pref_service)
-    : pref_service_(pref_service) {
+SyncPrefs::SyncPrefs(PrefService* pref_service) : pref_service_(pref_service) {
   DCHECK(pref_service);
   RegisterPrefGroups();
   // Watch the preference that indicates sync is managed so we can take
   // appropriate action.
-  pref_sync_managed_.Init(prefs::kSyncManaged, pref_service_,
-                           base::Bind(&SyncPrefs::OnSyncManagedPrefChanged,
-                                      base::Unretained(this)));
+  pref_sync_managed_.Init(
+      prefs::kSyncManaged,
+      pref_service_,
+      base::Bind(&SyncPrefs::OnSyncManagedPrefChanged, base::Unretained(this)));
 }
 
-SyncPrefs::~SyncPrefs() {
-  DCHECK(CalledOnValidThread());
-}
+SyncPrefs::~SyncPrefs() { DCHECK(CalledOnValidThread()); }
 
 // static
 void SyncPrefs::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(
       prefs::kSyncHasSetupCompleted,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(
       prefs::kSyncSuppressStart,
@@ skipping 30 matching lines @@
 
   registry->RegisterStringPref(
       prefs::kEnhancedBookmarksExtensionId,
       std::string(),
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   // All types are set to off by default, which forces a configuration to
   // explicitly enable them. GetPreferredTypes() will ensure that any new
   // implicit types are enabled when their pref group is, or via
   // KeepEverythingSynced.
-  for (syncer::ModelTypeSet::Iterator it = user_types.First();
-       it.Good(); it.Inc()) {
+  for (syncer::ModelTypeSet::Iterator it = user_types.First(); it.Good();
+       it.Inc()) {
     RegisterDataTypePreferredPref(registry, it.Get(), false);
   }
 
   registry->RegisterBooleanPref(
       prefs::kSyncManaged,
       false,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(
       prefs::kSyncEncryptionBootstrapToken,
       std::string(),
@@ skipping 87 matching lines @@
 bool SyncPrefs::IsStartSuppressed() const {
   DCHECK(CalledOnValidThread());
   return pref_service_->GetBoolean(prefs::kSyncSuppressStart);
 }
 
 void SyncPrefs::SetStartSuppressed(bool is_suppressed) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetBoolean(prefs::kSyncSuppressStart, is_suppressed);
 }
 
-std::string SyncPrefs::GetGoogleServicesUsername() const {
-  DCHECK(CalledOnValidThread());
-  return pref_service_->GetString(prefs::kGoogleServicesUsername);
-}
-
 base::Time SyncPrefs::GetLastSyncedTime() const {
   DCHECK(CalledOnValidThread());
-  return
-      base::Time::FromInternalValue(
-          pref_service_->GetInt64(prefs::kSyncLastSyncedTime));
+  return base::Time::FromInternalValue(
+      pref_service_->GetInt64(prefs::kSyncLastSyncedTime));
 }
 
 void SyncPrefs::SetLastSyncedTime(base::Time time) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetInt64(prefs::kSyncLastSyncedTime, time.ToInternalValue());
 }
 
 bool SyncPrefs::HasKeepEverythingSynced() const {
   DCHECK(CalledOnValidThread());
   return pref_service_->GetBoolean(prefs::kSyncKeepEverythingSynced);
 }
 
 void SyncPrefs::SetKeepEverythingSynced(bool keep_everything_synced) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetBoolean(prefs::kSyncKeepEverythingSynced,
                             keep_everything_synced);
 }
 
 syncer::ModelTypeSet SyncPrefs::GetPreferredDataTypes(
     syncer::ModelTypeSet registered_types) const {
   DCHECK(CalledOnValidThread());
 
-  // First remove any datatypes that are inconsistent with the current policies
-  // on the client (so that "keep everything synced" doesn't include them).
-  if (pref_service_->HasPrefPath(prefs::kSavingBrowserHistoryDisabled) &&

[Nicolas Zea, 2014/03/14 23:47:41]

moved to datatype controller

-      pref_service_->GetBoolean(prefs::kSavingBrowserHistoryDisabled)) {
-    registered_types.Remove(syncer::TYPED_URLS);
-  }
-
   if (pref_service_->GetBoolean(prefs::kSyncKeepEverythingSynced)) {
     return registered_types;
   }
 
   syncer::ModelTypeSet preferred_types;
-  for (syncer::ModelTypeSet::Iterator it = registered_types.First();
-       it.Good(); it.Inc()) {
+  for (syncer::ModelTypeSet::Iterator it = registered_types.First(); it.Good();
+       it.Inc()) {
     if (GetDataTypePreferred(it.Get())) {
       preferred_types.Put(it.Get());
     }
   }
   return ResolvePrefGroups(registered_types, preferred_types);
 }
 
-void SyncPrefs::SetPreferredDataTypes(
-    syncer::ModelTypeSet registered_types,
-    syncer::ModelTypeSet preferred_types) {
+void SyncPrefs::SetPreferredDataTypes(syncer::ModelTypeSet registered_types,
+                                      syncer::ModelTypeSet preferred_types) {
   DCHECK(CalledOnValidThread());
   DCHECK(registered_types.HasAll(preferred_types));
   preferred_types = ResolvePrefGroups(registered_types, preferred_types);
-  for (syncer::ModelTypeSet::Iterator i = registered_types.First();
-       i.Good(); i.Inc()) {
+  for (syncer::ModelTypeSet::Iterator i = registered_types.First(); i.Good();
+       i.Inc()) {
     SetDataTypePreferred(i.Get(), preferred_types.Has(i.Get()));
   }
 }
 
 bool SyncPrefs::IsManaged() const {
   DCHECK(CalledOnValidThread());
   return pref_service_->GetBoolean(prefs::kSyncManaged);
 }
 
 std::string SyncPrefs::GetEncryptionBootstrapToken() const {
   DCHECK(CalledOnValidThread());
   return pref_service_->GetString(prefs::kSyncEncryptionBootstrapToken);
 }
 
 void SyncPrefs::SetEncryptionBootstrapToken(const std::string& token) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetString(prefs::kSyncEncryptionBootstrapToken, token);
 }
 
 std::string SyncPrefs::GetKeystoreEncryptionBootstrapToken() const {
   DCHECK(CalledOnValidThread());
-  return pref_service_->GetString(
-      prefs::kSyncKeystoreEncryptionBootstrapToken);
+  return pref_service_->GetString(prefs::kSyncKeystoreEncryptionBootstrapToken);
 }
 
 void SyncPrefs::SetKeystoreEncryptionBootstrapToken(const std::string& token) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetString(prefs::kSyncKeystoreEncryptionBootstrapToken, token);
 }
 
 std::string SyncPrefs::GetSyncSessionsGUID() const {
   DCHECK(CalledOnValidThread());
   return pref_service_->GetString(prefs::kSyncSessionsGUID);
@@ skipping 89 matching lines @@
             syncer::ModelTypeSetFromValue(
                 *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes)));
 
   scoped_ptr<base::ListValue> value(
       syncer::ModelTypeSetToValue(acknowledged_types));
   pref_service_->Set(prefs::kSyncAcknowledgedSyncTypes, *value);
 }
 
 void SyncPrefs::OnSyncManagedPrefChanged() {
   DCHECK(CalledOnValidThread());
-  FOR_EACH_OBSERVER(SyncPrefObserver, sync_pref_observers_,
+  FOR_EACH_OBSERVER(SyncPrefObserver,
+                    sync_pref_observers_,
                     OnSyncManagedPrefChange(*pref_sync_managed_));
 }
 
 void SyncPrefs::SetManagedForTest(bool is_managed) {
   DCHECK(CalledOnValidThread());
   pref_service_->SetBoolean(prefs::kSyncManaged, is_managed);
 }
 
 syncer::ModelTypeSet SyncPrefs::GetAcknowledgeSyncedTypesForTest() const {
   DCHECK(CalledOnValidThread());
   return syncer::ModelTypeSetFromValue(
       *pref_service_->GetList(prefs::kSyncAcknowledgedSyncTypes));
 }
 
 void SyncPrefs::RegisterPrefGroups() {
   pref_groups_[syncer::APPS].Put(syncer::APP_NOTIFICATIONS);
   pref_groups_[syncer::APPS].Put(syncer::APP_SETTINGS);
   pref_groups_[syncer::APPS].Put(syncer::APP_LIST);
 
   pref_groups_[syncer::AUTOFILL].Put(syncer::AUTOFILL_PROFILE);
 
   pref_groups_[syncer::EXTENSIONS].Put(syncer::EXTENSION_SETTINGS);
 
   pref_groups_[syncer::PREFERENCES].Put(syncer::DICTIONARY);
   pref_groups_[syncer::PREFERENCES].Put(syncer::PRIORITY_PREFERENCES);
   pref_groups_[syncer::PREFERENCES].Put(syncer::SEARCH_ENGINES);
 
   pref_groups_[syncer::TYPED_URLS].Put(syncer::HISTORY_DELETE_DIRECTIVES);
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(

[Nicolas Zea, 2014/03/14 23:47:41]

obsolete

-          switches::kHistoryDisableFullHistorySync)) {
-    pref_groups_[syncer::TYPED_URLS].Put(syncer::SESSIONS);
-    pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_IMAGES);
-    pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_TRACKING);
-  }
+  pref_groups_[syncer::TYPED_URLS].Put(syncer::SESSIONS);
+  pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_IMAGES);
+  pref_groups_[syncer::TYPED_URLS].Put(syncer::FAVICON_TRACKING);
 
   pref_groups_[syncer::PROXY_TABS].Put(syncer::SESSIONS);
   pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_IMAGES);
   pref_groups_[syncer::PROXY_TABS].Put(syncer::FAVICON_TRACKING);
 
   pref_groups_[syncer::MANAGED_USER_SETTINGS].Put(syncer::SESSIONS);
 
   // TODO(zea): put favicons in the bookmarks group as well once it handles
   // those favicons.
 }
@@ skipping 25 matching lines @@
       pref_service_->GetUserPrefValue(pref_name) == NULL &&
       pref_service_->IsUserModifiablePreference(pref_name)) {
     // If there is no tab sync preference yet (i.e. newly enabled type),
     // default to the session sync preference value.
     pref_name = GetPrefNameForDataType(syncer::SESSIONS);
   }
 
   return pref_service_->GetBoolean(pref_name);
 }
 
-void SyncPrefs::SetDataTypePreferred(
-    syncer::ModelType type, bool is_preferred) {
+void SyncPrefs::SetDataTypePreferred(syncer::ModelType type,
+                                     bool is_preferred) {
   DCHECK(CalledOnValidThread());
   const char* pref_name = GetPrefNameForDataType(type);
   if (!pref_name) {
     NOTREACHED();
     return;
   }
   pref_service_->SetBoolean(pref_name, is_preferred);
 }
 
 syncer::ModelTypeSet SyncPrefs::ResolvePrefGroups(
     syncer::ModelTypeSet registered_types,
     syncer::ModelTypeSet types) const {
   DCHECK(registered_types.HasAll(types));
   syncer::ModelTypeSet types_with_groups = types;
   for (PrefGroupsMap::const_iterator i = pref_groups_.begin();
-      i != pref_groups_.end(); ++i) {
+       i != pref_groups_.end();
+       ++i) {
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
 
 }  // namespace browser_sync