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

chrome/browser/supervised_user/supervised_user_service.h

 // Copyright 2014 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_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
 #define CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 43 matching lines @@
 }
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class ExtensionRegistry;
 }
 
-namespace sync_driver {
+namespace syncer {
 class SyncSetupInProgressHandle;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 // This class handles all the information related to a given supervised profile
 // (e.g. the installed content packs, the default URL filtering behavior, or
 // manual whitelist/blacklist overrides).
 class SupervisedUserService : public KeyedService,
 #if defined(ENABLE_EXTENSIONS)
                               public extensions::ExtensionRegistryObserver,
                               public extensions::ManagementPolicy::Provider,
 #endif
-                              public SyncTypePreferenceProvider,
+                              public syncer::SyncTypePreferenceProvider,
 #if !defined(OS_ANDROID)
-                              public sync_driver::SyncServiceObserver,
+                              public syncer::SyncServiceObserver,
                               public chrome::BrowserListObserver,
 #endif
                               public SupervisedUserURLFilter::Observer {
  public:
   using NavigationBlockedCallback = base::Callback<void(content::WebContents*)>;
   using AuthErrorCallback = base::Callback<void(const GoogleServiceAuthError&)>;
   using SuccessCallback = base::Callback<void(bool)>;
 
   class Delegate {
    public:
@@ skipping 113 matching lines @@
   // Public for testing.
   bool IncludesSyncSessionsType() const;
 
   // ProfileKeyedService override:
   void Shutdown() override;
 
   // SyncTypePreferenceProvider implementation:
   syncer::ModelTypeSet GetPreferredDataTypes() const override;
 
 #if !defined(OS_ANDROID)
-  // sync_driver::SyncServiceObserver implementation:
+  // syncer::SyncServiceObserver implementation:
   void OnStateChanged() override;
 
   // chrome::BrowserListObserver implementation:
   void OnBrowserSetLastActive(Browser* browser) override;
 #endif  // !defined(OS_ANDROID)
 
   // SupervisedUserURLFilter::Observer implementation:
   void OnSiteListUpdated() override;
 
  private:
@@ skipping 237 matching lines @@
 
 #if defined(ENABLE_EXTENSIONS)
   ScopedObserver<extensions::ExtensionRegistry,
                  extensions::ExtensionRegistryObserver>
       registry_observer_;
 #endif
 
   base::ObserverList<SupervisedUserServiceObserver> observer_list_;
 
   // Prevents Sync from running until configuration is complete.
-  std::unique_ptr<sync_driver::SyncSetupInProgressHandle> sync_blocker_;
+  std::unique_ptr<syncer::SyncSetupInProgressHandle> sync_blocker_;
 
   base::WeakPtrFactory<SupervisedUserService> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_SUPERVISED_USER_SUPERVISED_USER_SERVICE_H_