Green Tree Tactical Force: Revert skrul's bad commits (probably a git-cl bug).

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2010 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 <map>
 #include <set>
 
 #include "app/l10n_util.h"
@@ skipping 126 matching lines @@
   // For now, the only thing we can do through policy is to turn sync off.
   if (IsManaged()) {
     DisableForUser();
     return;
   }
 
   if (!profile()->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted)) {
     DisableForUser();  // Clean up in case of previous crash / setup abort.
 
     // Automatically start sync in Chromium OS.
-    if (bootstrap_sync_authentication_ &&
-        !profile_->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart)) {
+    if (bootstrap_sync_authentication_) {
       // If the LSID is empty, we're in a CrOS UI test that is not testing sync
       // behavior, so we don't want the sync service to start.
       if (profile()->GetTokenService() &&
           !profile()->GetTokenService()->HasLsid()) {
         LOG(WARNING) << "Skipping CrOS sync startup, no LSID present.";
         return;
       }
       StartUp();
     }
   } else {
@@ skipping 51 matching lines @@
         browser_sync::StringToNotificationMethod(notification_method_str);
   }
 }
 
 void ProfileSyncService::RegisterPreferences() {
   PrefService* pref_service = profile_->GetPrefs();
   if (pref_service->FindPreference(prefs::kSyncLastSyncedTime))
     return;
   pref_service->RegisterInt64Pref(prefs::kSyncLastSyncedTime, 0);
   pref_service->RegisterBooleanPref(prefs::kSyncHasSetupCompleted, false);
-  pref_service->RegisterBooleanPref(prefs::kSyncSuppressStart, false);
 
   // If you've never synced before, or if you're using Chrome OS, 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)
   bool enable_by_default = true;
 #else
   bool enable_by_default =
       !pref_service->HasPrefPath(prefs::kSyncHasSetupCompleted);
@@ skipping 130 matching lines @@
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 }
 
 bool ProfileSyncService::HasSyncSetupCompleted() const {
   return profile_->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted);
 }
 
 void ProfileSyncService::SetSyncSetupCompleted() {
   PrefService* prefs = profile()->GetPrefs();
   prefs->SetBoolean(prefs::kSyncHasSetupCompleted, true);
-  prefs->SetBoolean(prefs::kSyncSuppressStart, false);
   prefs->ScheduleSavePersistentPrefs();
 }
 
 void ProfileSyncService::UpdateLastSyncedTime() {
   last_synced_time_ = base::Time::Now();
   profile_->GetPrefs()->SetInt64(prefs::kSyncLastSyncedTime,
       last_synced_time_.ToInternalValue());
   profile_->GetPrefs()->ScheduleSavePersistentPrefs();
 }
 
@@ skipping 62 matching lines @@
   backend_initialized_ = true;
 
   // The very first time the backend initializes is effectively the first time
   // we can say we successfully "synced".  last_synced_time_ will only be null
   // in this case, because the pref wasn't restored on StartUp.
   if (last_synced_time_.is_null())
     UpdateLastSyncedTime();
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 
   if (bootstrap_sync_authentication_) {
-    if (profile_->GetPrefs()->GetBoolean(prefs::kSyncSuppressStart)) {
-      ShowChooseDataTypes(NULL);
-    } else {
-      SetSyncSetupCompleted();
-    }
+    SetSyncSetupCompleted();
   }
 
   if (HasSyncSetupCompleted())
     ConfigureDataTypeManager();
 }
 
 void ProfileSyncService::OnSyncCycleCompleted() {
   UpdateLastSyncedTime();
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 }
@@ skipping 26 matching lines @@
   is_auth_in_progress_ = false;
   // Fan the notification out to interested UI-thread components.
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
 }
 
 void ProfileSyncService::OnStopSyncingPermanently() {
   if (SetupInProgress()) {
     wizard_.Step(SyncSetupWizard::SETUP_ABORTED_BY_PENDING_CLEAR);
     expect_sync_configuration_aborted_ = true;
   }
-  profile_->GetPrefs()->SetBoolean(prefs::kSyncSuppressStart, true);
+
   DisableForUser();
 }
 
 void ProfileSyncService::ShowLoginDialog(gfx::NativeWindow parent_window) {
   if (WizardIsVisible()) {
     wizard_.Focus();
     return;
   }
 
   if (!auth_error_time_.is_null()) {
@@ skipping 27 matching lines @@
 SyncBackendHost::Status ProfileSyncService::QueryDetailedSyncStatus() {
   if (backend_.get()) {
     return backend_->GetDetailedStatus();
   } else {
     SyncBackendHost::Status status =
         { SyncBackendHost::Status::OFFLINE_UNUSABLE };
     return status;
   }
 }
 
-bool ProfileSyncService::SetupInProgress() const {
-  return !HasSyncSetupCompleted() && WizardIsVisible();
-}
-
 std::wstring ProfileSyncService::BuildSyncStatusSummaryText(
   const sync_api::SyncManager::Status::Summary& summary) {
   switch (summary) {
     case sync_api::SyncManager::Status::OFFLINE:
       return L"OFFLINE";
     case sync_api::SyncManager::Status::OFFLINE_UNSYNCED:
       return L"OFFLINE_UNSYNCED";
     case sync_api::SyncManager::Status::SYNCING:
       return L"SYNCING";
     case sync_api::SyncManager::Status::READY:
@@ skipping 262 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }