USS SyncContextProxy / data type activation refactoring

chrome/browser/sync/glue/sync_backend_host_impl.h

 // Copyright 2013 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_SYNC_GLUE_SYNC_BACKEND_HOST_IMPL_H_
 #define CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 94 matching lines @@
       WARN_UNUSED_RESULT;
   void StopSyncingForShutdown() override;
   scoped_ptr<base::Thread> Shutdown(syncer::ShutdownReason reason) override;
   void UnregisterInvalidationIds() override;
   syncer::ModelTypeSet ConfigureDataTypes(
       syncer::ConfigureReason reason,
       const DataTypeConfigStateMap& config_state_map,
       const base::Callback<void(syncer::ModelTypeSet, syncer::ModelTypeSet)>&
           ready_task,
       const base::Callback<void()>& retry_callback) override;
-  void ActivateDataType(
+  void ActivateDirectoryDataType(
       syncer::ModelType type,
       syncer::ModelSafeGroup group,
       sync_driver::ChangeProcessor* change_processor) override;
-  void DeactivateDataType(syncer::ModelType type) override;
+  void DeactivateDirectoryDataType(syncer::ModelType type) override;
+  void ActivateNonBlockingDataType(
+      syncer::ModelType type,
+      scoped_ptr<syncer_v2::ActivationContext>) override;
+  void DeactivateNonBlockingDataType(syncer::ModelType type) override;
   void EnableEncryptEverything() override;
   syncer::UserShare* GetUserShare() const override;
   scoped_ptr<syncer_v2::SyncContextProxy> GetSyncContextProxy() override;
   Status GetDetailedStatus() override;
   syncer::sessions::SyncSessionSnapshot GetLastSessionSnapshot() const override;
   bool HasUnsyncedItems() const override;
   bool IsNigoriEnabled() const override;
   syncer::PassphraseType GetPassphraseType() const override;
   base::Time GetExplicitPassphraseTime() const override;
   bool IsCryptographerReady(
@@ skipping 249 matching lines @@
   bool invalidation_handler_registered_;
 
   base::WeakPtrFactory<SyncBackendHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SyncBackendHostImpl);
 };
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_GLUE_SYNC_BACKEND_HOST_IMPL_H_