[Sync] Avoid unregistering object IDs on shutdown

sync/notifier/non_blocking_invalidation_notifier.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/notifier/non_blocking_invalidation_notifier.h"
 
+#include <cstddef>
+
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "jingle/notifier/listener/push_client.h"
 #include "sync/notifier/invalidation_notifier.h"
 
 namespace syncer {
 
+namespace {
+
+const char kHandlerName[] = "NonBlockingInvalidationHandler";
+
+}  // namespace
+
 class NonBlockingInvalidationNotifier::Core
     : public base::RefCountedThreadSafe<NonBlockingInvalidationNotifier::Core>,
       // SyncNotifierObserver to observe the InvalidationNotifier we create.
       public SyncNotifierObserver {
  public:
   // Called on parent thread.  |delegate_observer| should be
   // initialized.
   explicit Core(
       const WeakHandle<SyncNotifierObserver>& delegate_observer);
 
@@ skipping 54 matching lines @@
   network_task_runner_ = notifier_options.request_context_getter->
       GetNetworkTaskRunner();
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   invalidation_notifier_.reset(
       new InvalidationNotifier(
           notifier::PushClient::CreateDefaultOnIOThread(notifier_options),
           initial_max_invalidation_versions,
           initial_invalidation_state,
           invalidation_state_tracker,
           client_info));
+  invalidation_notifier_->SetHandler(kHandlerName, this);
 }
 
-
 void NonBlockingInvalidationNotifier::Core::Teardown() {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
-  invalidation_notifier_->UpdateRegisteredIds(this, ObjectIdSet());
+  invalidation_notifier_->SetHandler(kHandlerName, NULL);
   invalidation_notifier_.reset();
   network_task_runner_ = NULL;
 }
 
 void NonBlockingInvalidationNotifier::Core::UpdateRegisteredIds(
     const ObjectIdSet& ids) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
-  invalidation_notifier_->UpdateRegisteredIds(this, ids);
+  invalidation_notifier_->UpdateRegisteredIds(kHandlerName, ids);
 }
 
 void NonBlockingInvalidationNotifier::Core::SetUniqueId(
     const std::string& unique_id) {
   DCHECK(network_task_runner_->BelongsToCurrentThread());
   invalidation_notifier_->SetUniqueId(unique_id);
 }
 
 void NonBlockingInvalidationNotifier::Core::SetStateDeprecated(
     const std::string& state) {
@@ skipping 60 matching lines @@
 NonBlockingInvalidationNotifier::~NonBlockingInvalidationNotifier() {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   if (!network_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(&NonBlockingInvalidationNotifier::Core::Teardown,
                      core_.get()))) {
     NOTREACHED();
   }
 }
 
+void NonBlockingInvalidationNotifier::SetHandler(
+    const std::string& handler_name,
+    SyncNotifierObserver* handler) {
+  DCHECK(parent_task_runner_->BelongsToCurrentThread());
+  helper_.SetHandler(handler_name, handler);
+}
+
 void NonBlockingInvalidationNotifier::UpdateRegisteredIds(
-    SyncNotifierObserver* handler, const ObjectIdSet& ids) {
+    const std::string& handler_name, const ObjectIdSet& ids) {

[msw, 2012/08/07 20:09:30]

one param per line

[akalin, 2012/08/07 23:38:05]

Done.

   DCHECK(parent_task_runner_->BelongsToCurrentThread());
-  const ObjectIdSet& all_registered_ids =
-      helper_.UpdateRegisteredIds(handler, ids);
+  helper_.UpdateRegisteredIds(handler_name, ids);
+  const ObjectIdSet& all_registered_ids = helper_.GetAllRegisteredIds();

[msw, 2012/08/07 20:09:30]

ditto nit: comment on |ids| != |all_registered_ids|?

[akalin, 2012/08/07 23:38:05]

ditto.

   if (!network_task_runner_->PostTask(
           FROM_HERE,
           base::Bind(
               &NonBlockingInvalidationNotifier::Core::UpdateRegisteredIds,
               core_.get(),
               all_registered_ids))) {
     NOTREACHED();
   }
 }
 
@@ skipping 50 matching lines @@
 }
 
 void NonBlockingInvalidationNotifier::OnIncomingNotification(
         const ObjectIdPayloadMap& id_payloads,
         IncomingNotificationSource source) {
   DCHECK(parent_task_runner_->BelongsToCurrentThread());
   helper_.DispatchInvalidationsToHandlers(id_payloads, source);
 }
 
 }  // namespace syncer