Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

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>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
 #include "chrome/browser/sync/sync_startup_tracker.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ skipping 10 matching lines @@
 
 namespace content {
 class WebContents;
 class WebUI;
 }  // namespace content
 
 namespace signin_metrics {
 enum class AccessPoint;
 }  // namespace signin_metrics
 
-namespace syncer {
+namespace sync_driver {
 class SyncSetupInProgressHandle;
-}  // namespace syncer
+}  // namespace sync_driver
 
 namespace settings {
 
 class PeopleHandler : public SettingsPageUIHandler,
                       public SigninManagerBase::Observer,
                       public SyncStartupTracker::Observer,
                       public LoginUIService::LoginUI,
-                      public syncer::SyncServiceObserver {
+                      public sync_driver::SyncServiceObserver {
  public:
   // TODO(tommycli): Remove these strings and instead use WebUIListener events.
   // These string constants are used from JavaScript (sync_browser_proxy.js).
   static const char kSpinnerPageStatus[];
   static const char kConfigurePageStatus[];
   static const char kTimeoutPageStatus[];
   static const char kDonePageStatus[];
   static const char kPassphraseFailedPageStatus[];
 
   explicit PeopleHandler(Profile* profile);
@@ skipping 51 matching lines @@
   // LoginUIService::LoginUI implementation.
   void FocusUI() override;
 
   // 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;
 
-  // syncer::SyncServiceObserver implementation.
+  // sync_driver::SyncServiceObserver implementation.
   void OnStateChanged() override;
 
   // 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.
   browser_sync::ProfileSyncService* GetSyncService() const;
 
@@ skipping 43 matching lines @@
   // Suppresses any further signin promos, since the user has signed in once.
   void MarkFirstSetupComplete();
 
   // Weak pointer.
   Profile* profile_;
 
   // Helper object used to wait for the sync backend to startup.
   std::unique_ptr<SyncStartupTracker> sync_startup_tracker_;
 
   // Prevents Sync from running until configuration is complete.
-  std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
+  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
 
   // 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_;
 
   // Used to listen for pref changes to allow or disallow signin.
   PrefChangeRegistrar profile_pref_registrar_;
 
   // Manages observer lifetimes.
   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_