sync: don't display one-click if setup is in progress

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 974 matching lines @@
 
 const GoogleServiceAuthError& ProfileSyncService::GetAuthError() const {
   return last_auth_error_;
 }
 
 bool ProfileSyncService::FirstSetupInProgress() const {
   return !HasSyncSetupCompleted() && setup_in_progress_;
 }
 
 void ProfileSyncService::SetSetupInProgress(bool setup_in_progress) {
+  bool was_in_progress = setup_in_progress_;
   setup_in_progress_ = setup_in_progress;
-  if (!setup_in_progress) {
+  if (!setup_in_progress && was_in_progress) {
     if (sync_initialized()) {
       ReconfigureDatatypeManager();
     }
   }
 }
 
 bool ProfileSyncService::sync_initialized() const {
   return backend_initialized_;
 }
 
@@ skipping 756 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);
 }