Revert 150990 - [Sync] Avoid unregistering object IDs on shutdown

sync/internal_api/test/fake_sync_manager.cc

 // Copyright (c) 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.
 
 #include "sync/internal_api/public/test/fake_sync_manager.h"
 
 #include <cstddef>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "sync/internal_api/public/internal_components_factory.h"
 #include "sync/internal_api/public/util/weak_handle.h"
 #include "sync/notifier/notifications_disabled_reason.h"
 #include "sync/notifier/object_id_payload_map.h"
 #include "sync/notifier/sync_notifier.h"
 
 namespace syncer {
 
-FakeSyncManager::FakeSyncManager(ModelTypeSet initial_sync_ended_types,
-                                 ModelTypeSet progress_marker_types,
-                                 ModelTypeSet configure_fail_types) :
-    initial_sync_ended_types_(initial_sync_ended_types),
-    progress_marker_types_(progress_marker_types),
-    configure_fail_types_(configure_fail_types) {}
+FakeSyncManager::FakeSyncManager() {}
 
 FakeSyncManager::~FakeSyncManager() {}
 
+void FakeSyncManager::set_initial_sync_ended_types(ModelTypeSet types) {
+  initial_sync_ended_types_ = types;
+}
+
+void FakeSyncManager::set_progress_marker_types(ModelTypeSet types) {
+  progress_marker_types_ = types;
+}
+
+void FakeSyncManager::set_configure_fail_types(ModelTypeSet types) {
+  configure_fail_types_ = types;
+}
+
 ModelTypeSet FakeSyncManager::GetAndResetCleanedTypes() {
   ModelTypeSet cleaned_types = cleaned_types_;
   cleaned_types_.Clear();
   return cleaned_types;
 }
 
 ModelTypeSet FakeSyncManager::GetAndResetDownloadedTypes() {
   ModelTypeSet downloaded_types = downloaded_types_;
   downloaded_types_.Clear();
   return downloaded_types;
@@ skipping 27 matching lines @@
 void FakeSyncManager::DisableNotifications(
     NotificationsDisabledReason reason) {
   if (!sync_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&FakeSyncManager::DisableNotificationsOnSyncThread,
                  base::Unretained(this), reason))) {
     NOTREACHED();
   }
 }
 
-namespace {
-
-void DoNothing() {}
-
-}  // namespace
-
-void FakeSyncManager::WaitForSyncThread() {
-  // Post a task to |sync_task_runner_| and block until it runs.
-  base::RunLoop run_loop;
-  if (!sync_task_runner_->PostTaskAndReply(
-      FROM_HERE,
-      base::Bind(&DoNothing),
-      run_loop.QuitClosure())) {
-    NOTREACHED();
-  }
-  run_loop.Run();
-}
-
 void FakeSyncManager::Init(
     const FilePath& database_location,
     const WeakHandle<JsEventHandler>& event_handler,
     const std::string& sync_server_and_path,
     int sync_server_port,
     bool use_ssl,
     const scoped_refptr<base::TaskRunner>& blocking_task_runner,
     scoped_ptr<HttpPostProviderFactory> post_factory,
     const std::vector<ModelSafeWorker*>& workers,
     ExtensionsActivityMonitor* extensions_activity_monitor,
@@ skipping 44 matching lines @@
 }
 
 void FakeSyncManager::UpdateCredentials(const SyncCredentials& credentials) {
   NOTIMPLEMENTED();
 }
 
 void FakeSyncManager::UpdateEnabledTypes(const ModelTypeSet& types) {
   enabled_types_ = types;
 }
 
-void FakeSyncManager::RegisterInvalidationHandler(
-    SyncNotifierObserver* handler) {
-  registrar_.RegisterHandler(handler);
-}
-
 void FakeSyncManager::UpdateRegisteredInvalidationIds(
     SyncNotifierObserver* handler,
     const ObjectIdSet& ids) {
-  registrar_.UpdateRegisteredIds(handler, ids);
-}
-
-void FakeSyncManager::UnregisterInvalidationHandler(
-    SyncNotifierObserver* handler) {
-  registrar_.UnregisterHandler(handler);
+  notifier_helper_.UpdateRegisteredIds(handler, ids);
 }
 
 void FakeSyncManager::StartSyncingNormally(
       const ModelSafeRoutingInfo& routing_info) {
   // Do nothing.
 }
 
 void FakeSyncManager::SetEncryptionPassphrase(const std::string& passphrase,
                                               bool is_explicit) {
   NOTIMPLEMENTED();
@@ skipping 92 matching lines @@
 
 bool FakeSyncManager::HasUnsyncedItems() {
   NOTIMPLEMENTED();
   return false;
 }
 
 void FakeSyncManager::InvalidateOnSyncThread(
     const ObjectIdPayloadMap& id_payloads,
     IncomingNotificationSource source) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-  registrar_.DispatchInvalidationsToHandlers(id_payloads, source);
+  notifier_helper_.DispatchInvalidationsToHandlers(id_payloads, source);
 }
 
 void FakeSyncManager::EnableNotificationsOnSyncThread() {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-  registrar_.EmitOnNotificationsEnabled();
+  notifier_helper_.EmitOnNotificationsEnabled();
 }
 
 void FakeSyncManager::DisableNotificationsOnSyncThread(
     NotificationsDisabledReason reason) {
   DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-  registrar_.EmitOnNotificationsDisabled(reason);
+  notifier_helper_.EmitOnNotificationsDisabled(reason);
 }
 
 }  // namespace syncer