Fix prefs registration in SyncPrefs.

chrome/browser/sync/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 "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/public/pref_member.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 25 matching lines @@
                             base::Bind(&SyncPrefs::OnSyncManagedPrefChanged,
                                        base::Unretained(this)));
   }
 }
 
 SyncPrefs::~SyncPrefs() {
   DCHECK(CalledOnValidThread());
 }
 
 // static
-void SyncPrefs::RegisterUserPrefs(PrefService* prefs,
-                                  PrefRegistrySyncable* registry) {
+void SyncPrefs::RegisterUserPrefs(PrefRegistrySyncable* registry) {
   // TODO(joi): Remove |prefs| parameter.
   registry->RegisterBooleanPref(prefs::kSyncHasSetupCompleted,
                                 false,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterBooleanPref(prefs::kSyncSuppressStart,
                                 false,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterInt64Pref(prefs::kSyncLastSyncedTime,
                               0,
                               PrefRegistrySyncable::UNSYNCABLE_PREF);
 
-  // If you've never synced before, or if you're using Chrome OS or Android,
-  // all datatypes are on by default.
-  // TODO(nick): Perhaps a better model would be to always default to false,
-  // and explicitly call SetDataTypes() when the user shows the wizard.
-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-  bool enable_by_default = true;
-#else
-  bool enable_by_default = !prefs->HasPrefPath(prefs::kSyncHasSetupCompleted);
-#endif
-
+  // All datatypes are on by default, but this gets set explicitly
+  // when you configure sync (when turning it on), in
+  // ProfileSyncService::OnUserChoseDatatypes.
   registry->RegisterBooleanPref(prefs::kSyncKeepEverythingSynced,
-                                enable_by_default,
+                                true,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   syncer::ModelTypeSet user_types = syncer::UserTypes();
 
   // Include proxy types as well, as they can be individually selected,
   // although they don't have sync representations.
   user_types.PutAll(syncer::ProxyTypes());
 
   // Treat bookmarks specially.
   RegisterDataTypePreferredPref(registry, syncer::BOOKMARKS, true);
   user_types.Remove(syncer::BOOKMARKS);
 
   for (syncer::ModelTypeSet::Iterator it = user_types.First();
        it.Good(); it.Inc()) {
-    RegisterDataTypePreferredPref(registry, it.Get(), enable_by_default);
+    RegisterDataTypePreferredPref(registry, it.Get(), true);
   }
 
   registry->RegisterBooleanPref(prefs::kSyncManaged,
                                 false,
                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kSyncEncryptionBootstrapToken,
                                "",
                                PrefRegistrySyncable::UNSYNCABLE_PREF);
   registry->RegisterStringPref(prefs::kSyncKeystoreEncryptionBootstrapToken,
                                "",
@@ skipping 357 matching lines @@
     if (types.Has(i->first))
       types_with_groups.PutAll(i->second);
     else
       types_with_groups.RemoveAll(i->second);
   }
   types_with_groups.RetainAll(registered_types);
   return types_with_groups;
 }
 
 }  // namespace browser_sync