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

components/sync/core/sync_manager.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_SYNC_MANAGER_H_
 #define COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 302 matching lines @@
                                ModelTypeSet to_unapply,
                                const ModelSafeRoutingInfo& new_routing_info,
                                const base::Closure& ready_task,
                                const base::Closure& retry_task) = 0;
 
   // Inform the syncer of a change in the invalidator's state.
   virtual void SetInvalidatorEnabled(bool invalidator_enabled) = 0;
 
   // Inform the syncer that its cached information about a type is obsolete.
   virtual void OnIncomingInvalidation(
-      ModelType type,
-      std::unique_ptr<InvalidationInterface> invalidation) = 0;
+      syncer::ModelType type,
+      std::unique_ptr<syncer::InvalidationInterface> invalidation) = 0;
 
   // Adds a listener to be notified of sync events.
   // NOTE: It is OK (in fact, it's probably a good idea) to call this before
   // having received OnInitializationCompleted.
   virtual void AddObserver(Observer* observer) = 0;
 
   // Remove the given observer.  Make sure to call this if the
   // Observer is being destroyed so the SyncManager doesn't
   // potentially dereference garbage.
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // Status-related getter.  May be called on any thread.
   virtual SyncStatus GetDetailedStatus() const = 0;
 
   // Call periodically from a database-safe thread to persist recent changes
   // to the syncapi model.
   virtual void SaveChanges() = 0;
 
   // Issue a final SaveChanges, and close sqlite handles.
   virtual void ShutdownOnSyncThread(ShutdownReason reason) = 0;
 
   // May be called from any thread.
   virtual UserShare* GetUserShare() = 0;
 
   // Returns an instance of the main interface for non-blocking sync types.
-  virtual std::unique_ptr<ModelTypeConnector> GetModelTypeConnectorProxy() = 0;
+  virtual std::unique_ptr<syncer_v2::ModelTypeConnector>
+  GetModelTypeConnectorProxy() = 0;
 
   // Returns the cache_guid of the currently open database.
   // Requires that the SyncManager be initialized.
   virtual const std::string cache_guid() = 0;
 
   // Reads the nigori node to determine if any experimental features should
   // be enabled.
   // Note: opens a transaction.  May be called on any thread.
   virtual bool ReceivedExperiment(Experiments* experiments) = 0;
 
   // Uses a read-only transaction to determine if the directory being synced has
   // any remaining unsynced items.  May be called on any thread.
   virtual bool HasUnsyncedItems() = 0;
 
   // Returns the SyncManager's encryption handler.
   virtual SyncEncryptionHandler* GetEncryptionHandler() = 0;
 
   // Ask the SyncManager to fetch updates for the given types.
   virtual void RefreshTypes(ModelTypeSet types) = 0;
 
   // Returns any buffered protocol events.  Does not clear the buffer.
   virtual std::vector<std::unique_ptr<ProtocolEvent>>
   GetBufferedProtocolEvents() = 0;
 
   // Functions to manage registrations of DebugInfoObservers.
   virtual void RegisterDirectoryTypeDebugInfoObserver(
-      TypeDebugInfoObserver* observer) = 0;
+      syncer::TypeDebugInfoObserver* observer) = 0;
   virtual void UnregisterDirectoryTypeDebugInfoObserver(
-      TypeDebugInfoObserver* observer) = 0;
+      syncer::TypeDebugInfoObserver* observer) = 0;
   virtual bool HasDirectoryTypeDebugInfoObserver(
-      TypeDebugInfoObserver* observer) = 0;
+      syncer::TypeDebugInfoObserver* observer) = 0;
 
   // Request that all current counter values be emitted as though they had just
   // been updated.  Useful for initializing new observers' state.
   virtual void RequestEmitDebugInfo() = 0;
 
   // Clears server data and invokes |callback| when complete.
   //
   // This is an asynchronous operation that requires interaction with the sync
   // server. The operation will automatically be retried with backoff until it
   // completes successfully or sync is shutdown.
   virtual void ClearServerData(const ClearServerDataCallback& callback) = 0;
 
   // Updates Sync's tracking of whether the cookie jar has a mismatch with the
   // chrome account. See ClientConfigParams proto message for more info.
   // Note: this does not trigger a sync cycle. It just updates the sync context.
   virtual void OnCookieJarChanged(bool account_mismatch, bool empty_jar) = 0;
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_CORE_SYNC_MANAGER_H_