[Sync] Move //components/sync to the syncer namespace, take 2.

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

Index: chrome/browser/ui/webui/settings/people_handler.h
diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h
index b7852d4204ef6c488998dae6e4c36d7ee31e1236..764240ee350d1806e1479b262e5134fa557a5e72 100644
--- a/chrome/browser/ui/webui/settings/people_handler.h
+++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_PEOPLE_HANDLER_H_
 
 #include <memory>
+#include <string>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
@@ -36,9 +37,9 @@ namespace signin_metrics {
 enum class AccessPoint;
 }  // namespace signin_metrics
 
-namespace sync_driver {
+namespace syncer {
 class SyncSetupInProgressHandle;
-}  // namespace sync_driver
+}  // namespace syncer
 
 namespace settings {
 
@@ -46,7 +47,7 @@ class PeopleHandler : public SettingsPageUIHandler,
                       public SigninManagerBase::Observer,
                       public SyncStartupTracker::Observer,
                       public LoginUIService::LoginUI,
-                      public sync_driver::SyncServiceObserver {
+                      public syncer::SyncServiceObserver {
  public:
   // TODO(tommycli): Remove these strings and instead use WebUIListener events.
   // These string constants are used from JavaScript (sync_browser_proxy.js).
@@ -118,7 +119,7 @@ class PeopleHandler : public SettingsPageUIHandler,
   void GoogleSignedOut(const std::string& account_id,
                        const std::string& username) override;
 
-  // sync_driver::SyncServiceObserver implementation.
+  // syncer::SyncServiceObserver implementation.
   void OnStateChanged() override;
 
   // Returns a newly created dictionary with a number of properties that
@@ -182,7 +183,7 @@ class PeopleHandler : public SettingsPageUIHandler,
   std::unique_ptr<SyncStartupTracker> sync_startup_tracker_;
 
   // Prevents Sync from running until configuration is complete.
-  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
+  std::unique_ptr<syncer::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