Extract Profile-independent GCMService from GCMProfileService

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 "base/prefs/pref_service.h"
 #include "chrome/browser/invalidation/gcm_invalidation_bridge.h"
 #include "chrome/browser/invalidation/invalidation_service_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
+#include "chrome/browser/services/gcm/gcm_service.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "sync/notifier/gcm_network_channel_delegate.h"
 #include "sync/notifier/invalidation_util.h"
 #include "sync/notifier/invalidator.h"
 #include "sync/notifier/invalidator_state.h"
@@ skipping 362 matching lines @@
       network_channel_options_.SetString("Options.HostPort",
                                          options.xmpp_host_port.ToString());
       network_channel_options_.SetString("Options.AuthMechanism",
                                          options.auth_mechanism);
       DCHECK_EQ(notifier::NOTIFICATION_SERVER, options.notification_method);
       network_channel_creator =
           syncer::NonBlockingInvalidator::MakePushClientChannelCreator(options);
       break;
     }
     case GCM_NETWORK_CHANNEL: {
-      gcm::GCMProfileService* gcm_profile_service =
+      gcm::GCMService* gcm_service =
           gcm::GCMProfileServiceFactory::GetForProfile(profile_);
       gcm_invalidation_bridge_.reset(new GCMInvalidationBridge(
-          gcm_profile_service, identity_provider_.get()));
+          gcm_service, identity_provider_.get()));
       network_channel_creator =
           syncer::NonBlockingInvalidator::MakeGCMNetworkChannelCreator(
               request_context_,
               gcm_invalidation_bridge_->CreateDelegate().Pass());
       break;
     }
     default: {
       NOTREACHED();
       return;
     }
@@ skipping 10 matching lines @@
   UpdateInvalidatorCredentials();
 
   invalidator_->RegisterHandler(this);
   invalidator_->UpdateRegisteredIds(
       this,
       invalidator_registrar_->GetAllRegisteredIds());
 }
 
 void TiclInvalidationService::UpdateInvalidationNetworkChannel() {
   InvalidationNetworkChannel network_channel_type = PUSH_CLIENT_CHANNEL;
   if (gcm::GCMProfileService::GetGCMEnabledState(profile_) ==

[dcheng, 2014/04/23 01:13:58]

Do we need to update this as well to indirect through GCMService? Or is that
something for a future CL?

[bartfab (slow), 2014/04/23 11:33:07]

Yes, this will be done in a follow-up CL that removes the Profile dependency
from TiclInvalidationService for good.

           gcm::GCMProfileService::ALWAYS_ENABLED &&
       (profile_->GetPrefs()->GetBoolean(
            prefs::kInvalidationServiceUseGCMChannel) ||
        CommandLine::ForCurrentProcess()->HasSwitch(
            switches::kInvalidationUseGCMChannel))) {
     network_channel_type = GCM_NETWORK_CHANNEL;
   }
   if (network_channel_type_ == network_channel_type)
     return;
   network_channel_type_ = network_channel_type;
@@ skipping 13 matching lines @@
 }
 
 void TiclInvalidationService::StopInvalidator() {
   DCHECK(invalidator_);
   gcm_invalidation_bridge_.reset();
   invalidator_->UnregisterHandler(this);
   invalidator_.reset();
 }
 
 }  // namespace invalidation