[sync] Prevent flash of error icon while loading syncSetup page

chrome/browser/ui/webui/settings/people_handler.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_PEOPLE_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_PEOPLE_HANDLER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 80 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, EnterBlankExistingPassphrase);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, TurnOnEncryptAllDisallowed);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerNonCrosTest,
                            UnrecoverableErrorInitializingSync);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerNonCrosTest, GaiaErrorInitializingSync);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerNonCrosTest, HandleCaptcha);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerNonCrosTest, HandleGaiaAuthFailure);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerNonCrosTest,
                            SubmitAuthWithInvalidUsername);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerFirstSigninTest, DisplayBasicLogin);
+  FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest,
+                           AcquireSyncBlockerWhenLoadingSyncSettingsSubpage);
 
   // SettingsPageUIHandler implementation.
   void RegisterMessages() override;
   void OnJavascriptAllowed() override;
   void OnJavascriptDisallowed() override;
 
   // SyncStartupTracker::Observer implementation.
   void SyncStartupCompleted() override;
   void SyncStartupFailed() override;
 
@@ skipping 56 matching lines @@
 
   // Pushes the updated sync prefs to JavaScript.
   void PushSyncPrefs();
 
   // Sends the current sync status to the JavaScript WebUI code.
   void UpdateSyncStatus();
 
   // Suppresses any further signin promos, since the user has signed in once.
   void MarkFirstSetupComplete();
 
+  // If we're directly loading the sync setup page, we acquire a
+  // SetupInProgressHandle early in order to prevent a lapse in
+  // ProfileSyncService's "SetupInProgress" status. This lapse previously
+  // occured between when the sync confirmation dialog was closed and when the
+  // sync setup page hadn't yet fired the SyncSetupShowSetupUI event.
+  // InitializeSyncBlocker is responsible for checking if we're navigating to
+  // the setup page and acquiring the sync_blocker.
+  void InitializeSyncBlocker();
+
   // Weak pointer.
   Profile* profile_;
 
   // Helper object used to wait for the sync engine to startup.
   std::unique_ptr<SyncStartupTracker> sync_startup_tracker_;
 
   // Prevents Sync from running until configuration is complete.
   std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
 
   // Set to true whenever the sync configure UI is visible. This is used to tell
@@ skipping 12 matching lines @@
   ScopedObserver<SigninManagerBase, PeopleHandler> signin_observer_;
   ScopedObserver<browser_sync::ProfileSyncService, PeopleHandler>
       sync_service_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(PeopleHandler);
 };
 
 }  // namespace settings
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_PEOPLE_HANDLER_H_