| Index: chrome/browser/invalidation/ticl_invalidation_service.cc
|
| diff --git a/chrome/browser/invalidation/ticl_invalidation_service.cc b/chrome/browser/invalidation/ticl_invalidation_service.cc
|
| index 3eecec9664d551ca91b4357d19cc35a7d236416b..2d1bc51edbf388963b6ee3ad9f81d83c2cd719d9 100644
|
| --- a/chrome/browser/invalidation/ticl_invalidation_service.cc
|
| +++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
|
| @@ -11,7 +11,6 @@
|
| #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"
|
| @@ -62,6 +61,7 @@ namespace invalidation {
|
|
|
| TiclInvalidationService::TiclInvalidationService(
|
| scoped_ptr<IdentityProvider> identity_provider,
|
| + gcm::GCMService* gcm_service,
|
| const scoped_refptr<net::URLRequestContextGetter>& request_context,
|
| Profile* profile)
|
| : OAuth2TokenService::Consumer("ticl_invalidation"),
|
| @@ -70,6 +70,7 @@ TiclInvalidationService::TiclInvalidationService(
|
| invalidator_registrar_(new syncer::InvalidatorRegistrar()),
|
| request_access_token_backoff_(&kRequestAccessTokenBackoffPolicy),
|
| network_channel_type_(PUSH_CLIENT_CHANNEL),
|
| + gcm_service_(gcm_service),
|
| request_context_(request_context),
|
| logger_() {}
|
|
|
| @@ -395,10 +396,8 @@ void TiclInvalidationService::StartInvalidator(
|
| break;
|
| }
|
| case GCM_NETWORK_CHANNEL: {
|
| - gcm::GCMService* gcm_service =
|
| - gcm::GCMProfileServiceFactory::GetForProfile(profile_);
|
| gcm_invalidation_bridge_.reset(new GCMInvalidationBridge(
|
| - gcm_service, identity_provider_.get()));
|
| + gcm_service_, identity_provider_.get()));
|
| network_channel_creator =
|
| syncer::NonBlockingInvalidator::MakeGCMNetworkChannelCreator(
|
| request_context_,
|
|
|