Unregister GCMInvalidationBridge from GCMDriver when user signs out.

components/invalidation/ticl_invalidation_service.cc

 // Copyright 2014 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 "components/invalidation/ticl_invalidation_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "components/gcm_driver/gcm_driver.h"
 #include "components/invalidation/gcm_invalidation_bridge.h"
@@ skipping 244 matching lines @@
     const std::string& account_id) {
   access_token_.clear();
   if (IsStarted())
     UpdateInvalidatorCredentials();
 }
 
 void TiclInvalidationService::OnActiveAccountLogout() {
   access_token_request_.reset();
   request_access_token_retry_timer_.Stop();
 
+  if (gcm_invalidation_bridge_)
+    gcm_invalidation_bridge_->Unregister();
+
   if (IsStarted()) {
     StopInvalidator();
   }
 
   // This service always expects to have a valid invalidation state. Thus, we
   // must generate a new client ID to replace the existing one. Setting a new
   // client ID also clears all other state.
   invalidation_state_tracker_->
       ClearAndSetNewClientId(GenerateInvalidatorClientId());
 }
@@ skipping 152 matching lines @@
 }
 
 void TiclInvalidationService::StopInvalidator() {
   DCHECK(invalidator_);
   gcm_invalidation_bridge_.reset();
   invalidator_->UnregisterHandler(this);
   invalidator_.reset();
 }
 
 }  // namespace invalidation