Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7458)

Unified Diff: chrome/browser/invalidation/ticl_invalidation_service.cc

Issue 225403021: Extract Profile-independent GCMService from GCMProfileService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed. Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8db91112eed2841dc898186def6549b1a27f179d..3eecec9664d551ca91b4357d19cc35a7d236416b 100644
--- a/chrome/browser/invalidation/ticl_invalidation_service.cc
+++ b/chrome/browser/invalidation/ticl_invalidation_service.cc
@@ -12,6 +12,7 @@
#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"
@@ -394,10 +395,10 @@ void TiclInvalidationService::StartInvalidator(
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_,

Powered by Google App Engine
This is Rietveld 408576698