Settings People Revamp: Fix some small bugs in the handler

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 "base/gtest_prod_util.h"
@@ skipping 47 matching lines @@
   // Terminates the sync setup flow.
   void CloseSyncSetup();
 
  protected:
   bool is_configuring_sync() const { return configuring_sync_; }
 
  private:
   friend class PeopleHandlerTest;
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest,
                            DisplayConfigureWithBackendDisabledAndCancel);
+  FRIEND_TEST_ALL_PREFIXES(
+      PeopleHandlerTest,
+      DisplayConfigureWithBackendDisabledAndSyncStartupCompleted);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, HandleSetupUIWhenSyncDisabled);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, SelectCustomEncryption);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, ShowSyncSetupWhenNotSignedIn);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, SuccessfullySetPassphrase);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, TestSyncEverything);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, TestSyncNothing);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, TestSyncAllManually);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, TestPassphraseStillRequired);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, TestSyncIndividualTypes);
   FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest,
@@ skipping 27 matching lines @@
   // SigninManagerBase::Observer implementation.
   void GoogleSigninSucceeded(const std::string& account_id,
                              const std::string& username,
                              const std::string& password) override;
   void GoogleSignedOut(const std::string& account_id,
                        const std::string& username) override;
 
   // sync_driver::SyncServiceObserver implementation.
   void OnStateChanged() override;
 
-  // Shows advanced configuration dialog without going through sign in dialog.
-  // Kicks the sync backend if necessary with showing spinner dialog until it
-  // gets ready.
-  void OpenConfigureSync();
-
   // Returns a newly created dictionary with a number of properties that
   // correspond to the status of sync.
   std::unique_ptr<base::DictionaryValue> GetSyncStatusDictionary();
 
   // Helper routine that gets the ProfileSyncService associated with the parent
   // profile.
   ProfileSyncService* GetSyncService() const;
 
   // Returns the LoginUIService for the parent profile.
   LoginUIService* GetLoginUIService() const;
@@ skipping 63 matching lines @@
   // histograms in the case that the user cancels out.
   bool configuring_sync_;
 
   // The OneShotTimer object used to timeout of starting the sync backend
   // service.
   std::unique_ptr<base::OneShotTimer> backend_start_timer_;
 
   // Used to listen for pref changes to allow or disallow signin.
   PrefChangeRegistrar profile_pref_registrar_;
 
-  // Manages observer lifetime.
+  // Manages observer lifetimes.
+  ScopedObserver<SigninManagerBase, PeopleHandler> signin_observer_;
   ScopedObserver<ProfileSyncService, PeopleHandler> sync_service_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(PeopleHandler);
 };
 
 }  // namespace settings
 
 #endif  // CHROME_BROWSER_UI_WEBUI_SETTINGS_PEOPLE_HANDLER_H_