Refactor GCMNetworkChannelDelegateImpl

chrome/browser/invalidation/ticl_invalidation_service.cc

 // Copyright (c) 2013 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 "chrome/browser/invalidation/ticl_invalidation_service.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/invalidation/gcm_network_channel_delegate_impl.h"
+#include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
 #include "chrome/browser/invalidation/invalidation_logger.h"
 #include "chrome/browser/invalidation/invalidation_service_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/about_signin_internals.h"
 #include "chrome/browser/signin/about_signin_internals_factory.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "google_apis/gaia/gaia_constants.h"
@@ skipping 331 matching lines @@
       notifier::NotifierOptions options =
           ParseNotifierOptions(*CommandLine::ForCurrentProcess());
       options.request_context_getter = profile_->GetRequestContext();
       options.auth_mechanism = "X-OAUTH2";
       DCHECK_EQ(notifier::NOTIFICATION_SERVER, options.notification_method);
       network_channel_creator =
           syncer::NonBlockingInvalidator::MakePushClientChannelCreator(options);
       break;
     }
     case GCM_NETWORK_CHANNEL: {
-      scoped_ptr<syncer::GCMNetworkChannelDelegate> delegate;
-      delegate.reset(new GCMNetworkChannelDelegateImpl(profile_));
+      gcm_invalidation_bridge_.reset(new GCMInvalidationBridge(profile_));
       network_channel_creator =
           syncer::NonBlockingInvalidator::MakeGCMNetworkChannelCreator(
               profile_->GetRequestContext(),
-              delegate.Pass());
+              gcm_invalidation_bridge_->CreateDelegate().Pass());
       break;
     }
     default: {
       NOTREACHED();
       return;
     }
   }
   invalidator_.reset(new syncer::NonBlockingInvalidator(
           network_channel_creator,
           invalidator_storage_->GetInvalidatorClientId(),
@@ skipping 16 matching lines @@
   std::string email = signin_manager_->GetAuthenticatedUsername();
 
   DCHECK(!email.empty()) << "Expected user to be signed in.";
 
   DVLOG(2) << "UpdateCredentials: " << email;
   invalidator_->UpdateCredentials(email, access_token_);
 }
 
 void TiclInvalidationService::StopInvalidator() {
   DCHECK(invalidator_);
+  gcm_invalidation_bridge_.reset();

[rlarocque, 2014/03/04 21:30:19]

Should this be reset after the invalidator_?  Does the ordering matter?

[pavely, 2014/03/04 23:01:54]

Doesn't really matter, they are independent objects.
Resetting bridge will tear down UI part of the pair leaving Core intact (with
invalid WeakPtr which is fine).
Resetting invalidator doesn't really do anything interesting on UI thread. All
the fun stuff happens later on IO thread.

   invalidator_->UnregisterHandler(this);
   invalidator_.reset();
 }
 
 void TiclInvalidationService::Logout() {
   access_token_request_.reset();
   request_access_token_retry_timer_.Stop();
 
   if (IsStarted()) {
     StopInvalidator();
   }
 
   // This service always expects to have a valid invalidator storage.
   // So we must not only clear the old one, but also start a new one.
   invalidator_storage_->Clear();
   invalidator_storage_.reset(new InvalidatorStorage(profile_->GetPrefs()));
   invalidator_storage_->SetInvalidatorClientId(GenerateInvalidatorClientId());
 }
 
 }  // namespace invalidation