[Sync] Move //components/sync_driver to //components/sync/driver.

components/sync/driver/sync_prefs.cc

Index: components/sync/driver/sync_prefs.cc
diff --git a/components/sync_driver/sync_prefs.cc b/components/sync/driver/sync_prefs.cc
similarity index 98%
rename from components/sync_driver/sync_prefs.cc
rename to components/sync/driver/sync_prefs.cc
index 9081633de7db59e2e5d112d02b31e4cf0103cf75..4f1eed6db2539d807e0e9b73f9adfc7662f249ee 100644
--- a/components/sync_driver/sync_prefs.cc
+++ b/components/sync/driver/sync_prefs.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync_driver/sync_prefs.h"
+#include "components/sync/driver/sync_prefs.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ -12,7 +12,7 @@
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_service.h"
-#include "components/sync_driver/pref_names.h"
+#include "components/sync/driver/pref_names.h"
 
 namespace sync_driver {
 
@@ -24,14 +24,15 @@ SyncPrefs::SyncPrefs(PrefService* pref_service) : pref_service_(pref_service) {
   // Watch the preference that indicates sync is managed so we can take
   // appropriate action.
   pref_sync_managed_.Init(
-      prefs::kSyncManaged,
-      pref_service_,
+      prefs::kSyncManaged, pref_service_,
       base::Bind(&SyncPrefs::OnSyncManagedPrefChanged, base::Unretained(this)));
 }
 
 SyncPrefs::SyncPrefs() : pref_service_(NULL) {}
 
-SyncPrefs::~SyncPrefs() { DCHECK(CalledOnValidThread()); }
+SyncPrefs::~SyncPrefs() {
+  DCHECK(CalledOnValidThread());
+}
 
 // static
 void SyncPrefs::RegisterProfilePrefs(
@@ -340,8 +341,7 @@ void SyncPrefs::SetSpareBootstrapToken(const std::string& token) {
 
 void SyncPrefs::OnSyncManagedPrefChanged() {
   DCHECK(CalledOnValidThread());
-  FOR_EACH_OBSERVER(SyncPrefObserver,
-                    sync_pref_observers_,
+  FOR_EACH_OBSERVER(SyncPrefObserver, sync_pref_observers_,
                     OnSyncManagedPrefChange(*pref_sync_managed_));
 }
 
@@ -435,8 +435,7 @@ syncer::ModelTypeSet SyncPrefs::ResolvePrefGroups(
     syncer::ModelTypeSet types) const {
   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);
   }