Clean up LoginUIService. Remove Singleton behavior from PeopleHandler

chrome/browser/ui/webui/options/sync_setup_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_
 
 #include <memory>
 
 #include "base/gtest_prod_util.h"
@@ skipping 26 matching lines @@
   // OptionsPageUIHandler implementation.
   void GetLocalizedValues(base::DictionaryValue* localized_strings) override;
   void RegisterMessages() override;
 
   // SyncStartupTracker::Observer implementation;
   void SyncStartupCompleted() override;
   void SyncStartupFailed() override;
 
   // LoginUIService::LoginUI implementation.
   void FocusUI() override;
-  void CloseUI() override;
 
   static void GetStaticLocalizedValues(
       base::DictionaryValue* localized_strings,
       content::WebUI* web_ui);
 
   // Initializes the sync setup flow and shows the setup UI.
   void OpenSyncSetup(bool creating_supervised_user);
 
   // Shows advanced configuration dialog without going through sign in dialog.
   // Kicks the sync backend if necessary with showing spinner dialog until it
@@ skipping 72 matching lines @@
 
   // Displays spinner-only UI indicating that something is going on in the
   // background.
   // TODO(kochi): better to show some message that the user can understand what
   // is running in the background.
   void DisplaySpinner();
 
   // Displays an error dialog which shows timeout of starting the sync backend.
   void DisplayTimeout();
 
+  // Closes the associated sync settings page.
+  void CloseUI();
+
   // Returns true if this object is the active login object.
   bool IsActiveLogin() const;
 
   // If a wizard already exists, return true. Otherwise, return false.
   bool IsExistingWizardPresent();
 
   // If a wizard already exists, focus it and return true.
   bool FocusExistingWizardIfPresent();
 
   // Display the configure sync UI. If |passphrase_failed| is true, the account
   // requires a passphrase and one hasn't been provided or it was invalid.
   void DisplayConfigureSync(bool passphrase_failed);
 
   // Helper object used to wait for the sync backend to startup.
   std::unique_ptr<SyncStartupTracker> sync_startup_tracker_;
 
   // Set to true whenever the sync configure UI is visible. This is used to tell
   // what stage of the setup wizard the user was in and to update the UMA
   // 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_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncSetupHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_SYNC_SETUP_HANDLER_H_