Add InvalidationStateTracker::Forget() to erase an entry from storage.

sync/notifier/chrome_invalidation_client.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/chrome_invalidation_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 91 matching lines @@
   chrome_system_resources_.network()->UpdateCredentials(email, token);
 }
 
 void ChromeInvalidationClient::UpdateRegisteredIds(const ObjectIdSet& ids) {
   DCHECK(CalledOnValidThread());
   registered_ids_ = ids;
   // |ticl_state_| can go to NO_NOTIFICATION_ERROR even without a
   // working XMPP connection (as observed by us), so check it instead
   // of GetState() (see http://crbug.com/139424).
   if (ticl_state_ == NO_NOTIFICATION_ERROR && registration_manager_.get()) {
-    registration_manager_->UpdateRegisteredIds(registered_ids_);
+    DoRegistrationUpdate();
   }
-  // TODO(akalin): Clear invalidation versions for unregistered types.
 }
 
 void ChromeInvalidationClient::Ready(
     invalidation::InvalidationClient* client) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(client, invalidation_client_.get());
   ticl_state_ = NO_NOTIFICATION_ERROR;
   EmitStateChange();
-  registration_manager_->UpdateRegisteredIds(registered_ids_);
+  DoRegistrationUpdate();
 }
 
 void ChromeInvalidationClient::Invalidate(
     invalidation::InvalidationClient* client,
     const invalidation::Invalidation& invalidation,
     const invalidation::AckHandle& ack_handle) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(client, invalidation_client_.get());
   DVLOG(1) << "Invalidate: " << InvalidationToString(invalidation);
 
@@ skipping 103 matching lines @@
   DVLOG(1) << "InformRegistrationFailure: "
            << ObjectIdToString(object_id)
            << "is_transient=" << is_transient
            << ", message=" << error_message;
 
   if (is_transient) {
     // We don't care about |unknown_hint|; we let
     // |registration_manager_| handle the registration backoff policy.
     registration_manager_->MarkRegistrationLost(object_id);
   } else {
-    // Non-transient failures are permanent, so block any future
-    // registration requests for |model_type|.  (This happens if the
-    // server doesn't recognize the data type, which could happen for
-    // brand-new data types.)
+    // Non-transient failures require an action to resolve. This could happen
+    // because:
+    // - the server doesn't yet recognize the data type, which could happen for
+    //   brand-new data types.
+    // - the user has changed his password and hasn't updated it yet locally.
+    // Either way, block future registration attempts for |object_id|. However,
+    // we don't forget any saved invalidation state since we may use it once the
+    // error is addressed.
     registration_manager_->DisableId(object_id);
   }
 }
 
 void ChromeInvalidationClient::ReissueRegistrations(
     invalidation::InvalidationClient* client,
     const std::string& prefix,
     int prefix_length) {
   DCHECK(CalledOnValidThread());
   DCHECK_EQ(client, invalidation_client_.get());
@@ skipping 17 matching lines @@
   EmitStateChange();
 }
 
 void ChromeInvalidationClient::WriteState(const std::string& state) {
   DCHECK(CalledOnValidThread());
   DVLOG(1) << "WriteState";
   invalidation_state_tracker_.Call(
       FROM_HERE, &InvalidationStateTracker::SetInvalidationState, state);
 }
 
+void ChromeInvalidationClient::DoRegistrationUpdate() {
+  DCHECK(CalledOnValidThread());
+  const ObjectIdSet& unregistered_ids =
+      registration_manager_->UpdateRegisteredIds(registered_ids_);
+  invalidation_state_tracker_.Call(
+      FROM_HERE, &InvalidationStateTracker::Forget, unregistered_ids);
+}
+
 void ChromeInvalidationClient::StopForTest() {
   DCHECK(CalledOnValidThread());
   Stop();
 }
 
 void ChromeInvalidationClient::Stop() {
   DCHECK(CalledOnValidThread());
   if (!invalidation_client_.get()) {
     return;
   }
@@ skipping 51 matching lines @@
   EmitStateChange();
 }
 
 void ChromeInvalidationClient::OnIncomingNotification(
     const notifier::Notification& notification) {
   DCHECK(CalledOnValidThread());
   // Do nothing, since this is already handled by |invalidation_client_|.
 }
 
 }  // namespace syncer