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

components/sync/core_impl/sync_manager_impl.h

 // Copyright 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 COMPONENTS_SYNC_CORE_IMPL_SYNC_MANAGER_IMPL_H_
 #define COMPONENTS_SYNC_CORE_IMPL_SYNC_MANAGER_IMPL_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 67 matching lines @@
   void ConfigureSyncer(ConfigureReason reason,
                        ModelTypeSet to_download,
                        ModelTypeSet to_purge,
                        ModelTypeSet to_journal,
                        ModelTypeSet to_unapply,
                        const ModelSafeRoutingInfo& new_routing_info,
                        const base::Closure& ready_task,
                        const base::Closure& retry_task) override;
   void SetInvalidatorEnabled(bool invalidator_enabled) override;
   void OnIncomingInvalidation(
-      ModelType type,
+      syncer::ModelType type,
       std::unique_ptr<InvalidationInterface> invalidation) override;
   void AddObserver(SyncManager::Observer* observer) override;
   void RemoveObserver(SyncManager::Observer* observer) override;
   SyncStatus GetDetailedStatus() const override;
   void SaveChanges() override;
   void ShutdownOnSyncThread(ShutdownReason reason) override;
   UserShare* GetUserShare() override;
-  std::unique_ptr<ModelTypeConnector> GetModelTypeConnectorProxy() override;
+  std::unique_ptr<syncer_v2::ModelTypeConnector> GetModelTypeConnectorProxy()
+      override;
   const std::string cache_guid() override;
   bool ReceivedExperiment(Experiments* experiments) override;
   bool HasUnsyncedItems() override;
   SyncEncryptionHandler* GetEncryptionHandler() override;
   std::vector<std::unique_ptr<ProtocolEvent>> GetBufferedProtocolEvents()
       override;
   void RegisterDirectoryTypeDebugInfoObserver(
-      TypeDebugInfoObserver* observer) override;
+      syncer::TypeDebugInfoObserver* observer) override;
   void UnregisterDirectoryTypeDebugInfoObserver(
-      TypeDebugInfoObserver* observer) override;
+      syncer::TypeDebugInfoObserver* observer) override;
   bool HasDirectoryTypeDebugInfoObserver(
-      TypeDebugInfoObserver* observer) override;
+      syncer::TypeDebugInfoObserver* observer) override;
   void RequestEmitDebugInfo() override;
   void ClearServerData(const ClearServerDataCallback& callback) override;
   void OnCookieJarChanged(bool account_mismatch, bool empty_jar) override;
 
   // SyncEncryptionHandler::Observer implementation.
   void OnPassphraseRequired(
       PassphraseRequiredReason reason,
       const sync_pb::EncryptedData& pending_keys) override;
   void OnPassphraseAccepted() override;
   void OnBootstrapTokenUpdated(const std::string& bootstrap_token,
@@ skipping 44 matching lines @@
   void RefreshTypes(ModelTypeSet types) override;
 
   // These OnYYYChanged() methods are only called by our NetworkChangeNotifier.
   // Called when IP address of primary interface changes.
   void OnIPAddressChanged() override;
   // Called when the connection type of the system has changed.
   void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType) override;
 
   // NudgeHandler implementation.
-  void NudgeForInitialDownload(ModelType type) override;
-  void NudgeForCommit(ModelType type) override;
-  void NudgeForRefresh(ModelType type) override;
+  void NudgeForInitialDownload(syncer::ModelType type) override;
+  void NudgeForCommit(syncer::ModelType type) override;
+  void NudgeForRefresh(syncer::ModelType type) override;
 
   const SyncScheduler* scheduler() const;
 
   bool GetHasInvalidAuthTokenForTest() const;
 
  protected:
   // Helper functions.  Virtual for testing.
   virtual void NotifyInitializationSuccess();
   virtual void NotifyInitializationFailure();
 
@@ skipping 147 matching lines @@
   std::unique_ptr<SyncEncryptionHandlerImpl> sync_encryption_handler_;
 
   base::WeakPtrFactory<SyncManagerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_CORE_IMPL_SYNC_MANAGER_IMPL_H_