[Sync] Unrevert fix for bug 154940

chrome/browser/sync/profile_sync_service.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/profile_sync_service.h"
 
 #include <cstddef>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 10 matching lines @@
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/about_flags.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/net/chrome_cookie_notification_details.h"
+#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
 #include "chrome/browser/signin/token_service_factory.h"
 #include "chrome/browser/sync/backend_migrator.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/chrome_encryptor.h"
 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/session_data_type_controller.h"
 #include "chrome/browser/sync/glue/session_model_associator.h"
 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h"
 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
 #include "chrome/browser/sync/sync_global_error.h"
 #include "chrome/browser/sync/user_selectable_sync_type.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "grit/generated_resources.h"
 #include "net/cookies/cookie_monster.h"
 #include "sync/api/sync_error.h"
 #include "sync/internal_api/public/configure_reason.h"
@@ skipping 144 matching lines @@
     return;
   }
 
   RegisterAuthNotifications();
 
   if (!HasSyncSetupCompleted() || signin_->GetAuthenticatedUsername().empty()) {
     // Clean up in case of previous crash / setup abort / signout.
     DisableForUser();
   }
 
+  TrySyncDatatypePrefRecovery();
+
   TryStart();
 }
 
+void ProfileSyncService::TrySyncDatatypePrefRecovery() {
+  DCHECK(!sync_initialized());
+  if (!HasSyncSetupCompleted())
+    return;
+
+  // There was a bug where OnUserChoseDatatypes was not properly called on
+  // configuration (see crbug.com/154940). We detect this by checking whether
+  // kSyncKeepEverythingSynced has a default value. If so, and sync setup has
+  // completed, it means sync was not properly configured, so we manually
+  // set kSyncKeepEverythingSynced.
+  PrefService* const pref_service = profile_->GetPrefs();
+  if (!pref_service)
+    return;
+  if (sync_prefs_.HasKeepEverythingSynced())
+    return;
+  const syncer::ModelTypeSet registered_types = GetRegisteredDataTypes();
+  if (sync_prefs_.GetPreferredDataTypes(registered_types).Size() > 1)
+    return;
+
+  const PrefService::Preference* keep_everything_synced =
+      pref_service->FindPreference(prefs::kSyncKeepEverythingSynced);
+  // This will be false if the preference was properly set or if it's controlled
+  // by policy.
+  if (!keep_everything_synced->IsDefaultValue())
+    return;
+
+  // kSyncKeepEverythingSynced was not properly set. Set it and the preferred
+  // types now, before we configure.
+  UMA_HISTOGRAM_COUNTS("Sync.DatatypePrefRecovery", 1);
+  sync_prefs_.SetKeepEverythingSynced(true);
+  sync_prefs_.SetPreferredDataTypes(registered_types,
+                                    registered_types);
+}
+
 void ProfileSyncService::TryStart() {
   if (!IsSyncEnabledAndLoggedIn())
     return;
   TokenService* token_service = TokenServiceFactory::GetForProfile(profile_);
   if (!token_service)
     return;
   // Don't start the backend if the token service hasn't finished loading tokens
   // yet (if the backend is started before the sync token has been loaded,
   // GetCredentials() will return bogus credentials). On auto_start platforms
   // (like ChromeOS) we don't start sync until tokens are loaded, because the
@@ skipping 1633 matching lines @@
   // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefined-behaviour-after-directly-calling-the-destru.
   ProfileSyncService* old_this = this;
   this->~ProfileSyncService();
   new(old_this) ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile,
                                            CommandLine::ForCurrentProcess()),
       profile,
       signin,
       behavior);
 }