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

components/sync/driver/fake_sync_service.h

Index: components/sync/driver/fake_sync_service.h
diff --git a/components/sync/driver/fake_sync_service.h b/components/sync/driver/fake_sync_service.h
index 26987ccd8c6386c357e205ecc885022c0e7d1c13..7f051f5e7e45d0117435ac87cfac57ec4a843a3b 100644
--- a/components/sync/driver/fake_sync_service.h
+++ b/components/sync/driver/fake_sync_service.h
@@ -13,34 +13,37 @@
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace syncer {
-
 class BaseTransaction;
 struct UserShare;
+}
+
+namespace sync_driver {
 
-// Fake implementation of SyncService, used for testing.
-class FakeSyncService : public SyncService {
+// Fake implementation of sync_driver::SyncService, used for testing.
+class FakeSyncService : public sync_driver::SyncService {
  public:
   FakeSyncService();
   ~FakeSyncService() override;
 
  private:
-  // SyncService:
+  // sync_driver::SyncService:
   bool IsFirstSetupComplete() const override;
   bool IsSyncAllowed() const override;
   bool IsSyncActive() const override;
-  void TriggerRefresh(const ModelTypeSet& types) override;
-  ModelTypeSet GetActiveDataTypes() const override;
+  void TriggerRefresh(const syncer::ModelTypeSet& types) override;
+  syncer::ModelTypeSet GetActiveDataTypes() const override;
   SyncClient* GetSyncClient() const override;
   void AddObserver(SyncServiceObserver* observer) override;
   void RemoveObserver(SyncServiceObserver* observer) override;
   bool HasObserver(const SyncServiceObserver* observer) const override;
-  void OnDataTypeRequestsSyncStartup(ModelType type) override;
+  void OnDataTypeRequestsSyncStartup(syncer::ModelType type) override;
   bool CanSyncStart() const override;
-  void RequestStop(SyncService::SyncStopDataFate data_fate) override;
+  void RequestStop(
+      sync_driver::SyncService::SyncStopDataFate data_fate) override;
   void RequestStart() override;
-  ModelTypeSet GetPreferredDataTypes() const override;
+  syncer::ModelTypeSet GetPreferredDataTypes() const override;
   void OnUserChoseDatatypes(bool sync_everything,
-                            ModelTypeSet chosen_types) override;
+                            syncer::ModelTypeSet chosen_types) override;
   void SetFirstSetupComplete() override;
   bool IsFirstSetupInProgress() const override;
   std::unique_ptr<SyncSetupInProgressHandle> GetSetupInProgressHandle()
@@ -59,40 +62,46 @@ class FakeSyncService : public SyncService {
   void SetEncryptionPassphrase(const std::string& passphrase,
                                PassphraseType type) override;
   bool SetDecryptionPassphrase(const std::string& passphrase) override;
-  bool IsCryptographerReady(const BaseTransaction* trans) const override;
-  UserShare* GetUserShare() const override;
+  bool IsCryptographerReady(
+      const syncer::BaseTransaction* trans) const override;
+  syncer::UserShare* GetUserShare() const override;
   LocalDeviceInfoProvider* GetLocalDeviceInfoProvider() const override;
   void RegisterDataTypeController(
-      std::unique_ptr<DataTypeController> data_type_controller) override;
-  void ReenableDatatype(ModelType type) override;
+      std::unique_ptr<sync_driver::DataTypeController> data_type_controller)
+      override;
+  void ReenableDatatype(syncer::ModelType type) override;
   SyncTokenStatus GetSyncTokenStatus() const override;
   std::string QuerySyncStatusSummaryString() override;
-  bool QueryDetailedSyncStatus(SyncStatus* result) override;
+  bool QueryDetailedSyncStatus(syncer::SyncStatus* result) override;
   base::string16 GetLastSyncedTimeString() const override;
   std::string GetBackendInitializationStateString() const override;
-  SyncCycleSnapshot GetLastCycleSnapshot() const override;
+  syncer::SyncCycleSnapshot GetLastCycleSnapshot() const override;
   base::Value* GetTypeStatusMap() const override;
   const GURL& sync_service_url() const override;
   std::string unrecoverable_error_message() const override;
   tracked_objects::Location unrecoverable_error_location() const override;
-  void AddProtocolEventObserver(ProtocolEventObserver* observer) override;
-  void RemoveProtocolEventObserver(ProtocolEventObserver* observer) override;
-  void AddTypeDebugInfoObserver(TypeDebugInfoObserver* observer) override;
-  void RemoveTypeDebugInfoObserver(TypeDebugInfoObserver* observer) override;
-  base::WeakPtr<JsController> GetJsController() override;
+  void AddProtocolEventObserver(
+      browser_sync::ProtocolEventObserver* observer) override;
+  void RemoveProtocolEventObserver(
+      browser_sync::ProtocolEventObserver* observer) override;
+  void AddTypeDebugInfoObserver(
+      syncer::TypeDebugInfoObserver* observer) override;
+  void RemoveTypeDebugInfoObserver(
+      syncer::TypeDebugInfoObserver* observer) override;
+  base::WeakPtr<syncer::JsController> GetJsController() override;
   void GetAllNodes(const base::Callback<void(std::unique_ptr<base::ListValue>)>&
                        callback) override;
 
   // DataTypeEncryptionHandler:
   bool IsPassphraseRequired() const override;
-  ModelTypeSet GetEncryptedDataTypes() const override;
+  syncer::ModelTypeSet GetEncryptedDataTypes() const override;
 
   GoogleServiceAuthError error_;
   GURL sync_service_url_;
   std::string unrecoverable_error_message_;
-  std::unique_ptr<UserShare> user_share_;
+  std::unique_ptr<syncer::UserShare> user_share_;
 };
 
-}  // namespace syncer
+}  // namespace sync_driver
 
 #endif  // COMPONENTS_SYNC_DRIVER_FAKE_SYNC_SERVICE_H_