Index: sync/internal_api/public/test/fake_sync_manager.h |
diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h |
index 604429f7d7d500827e2caa8124ed57a8b6f50ca2..9661659ef2bd49a670fcb3c53cdf7ab7f159b617 100644 |
--- a/sync/internal_api/public/test/fake_sync_manager.h |
+++ b/sync/internal_api/public/test/fake_sync_manager.h |
@@ -10,7 +10,7 @@ |
#include "base/memory/ref_counted.h" |
#include "base/observer_list.h" |
#include "sync/internal_api/public/sync_manager.h" |
-#include "sync/notifier/sync_notifier_registrar.h" |
+#include "sync/notifier/invalidator_registrar.h" |
namespace base { |
class SequencedTaskRunner; |
@@ -81,7 +81,7 @@ class FakeSyncManager : public SyncManager { |
ExtensionsActivityMonitor* extensions_activity_monitor, |
ChangeDelegate* change_delegate, |
const SyncCredentials& credentials, |
- scoped_ptr<SyncNotifier> sync_notifier, |
+ scoped_ptr<Invalidator> invalidator, |
const std::string& restored_key_for_bootstrapping, |
const std::string& restored_keystore_key_for_bootstrapping, |
scoped_ptr<InternalComponentsFactory> internal_components_factory, |
@@ -97,12 +97,12 @@ class FakeSyncManager : public SyncManager { |
virtual void UpdateCredentials(const SyncCredentials& credentials) OVERRIDE; |
virtual void UpdateEnabledTypes(const ModelTypeSet& types) OVERRIDE; |
virtual void RegisterInvalidationHandler( |
- SyncNotifierObserver* handler) OVERRIDE; |
+ InvalidationHandler* handler) OVERRIDE; |
virtual void UpdateRegisteredInvalidationIds( |
- SyncNotifierObserver* handler, |
+ InvalidationHandler* handler, |
const ObjectIdSet& ids) OVERRIDE; |
virtual void UnregisterInvalidationHandler( |
- SyncNotifierObserver* handler) OVERRIDE; |
+ InvalidationHandler* handler) OVERRIDE; |
virtual void StartSyncingNormally( |
const ModelSafeRoutingInfo& routing_info) OVERRIDE; |
virtual void ConfigureSyncer( |
@@ -149,8 +149,8 @@ class FakeSyncManager : public SyncManager { |
// The set of types that have been enabled. |
ModelTypeSet enabled_types_; |
- // Faked notifier state. |
- SyncNotifierRegistrar registrar_; |
+ // Faked invalidator state. |
+ InvalidatorRegistrar registrar_; |
scoped_ptr<FakeSyncEncryptionHandler> fake_encryption_handler_; |