chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc - Issue 1425783002: Componentizing GcmProfileService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc

Issue 1425783002: Componentizing GcmProfileService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix UT errors as per comments Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/services/gcm/gcm_profile_service_unittest.cc ('k') | chrome/browser/signin/easy_unlock_service_regular.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc

diff --git a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc b/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc

index b8d1f3c70d32da04c5ffb7f615b3f568fdead120..635577f33ceabb7da7e35af7937ca005407af916 100644

--- a/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc

+++ b/chrome/browser/services/gcm/instance_id/instance_id_profile_service.cc

@@ -6,8 +6,8 @@

#include "base/logging.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 "components/gcm_driver/gcm_profile_service.h"

#include "components/gcm_driver/instance_id/instance_id_driver.h"

namespace instance_id {

@@ -15,7 +15,7 @@ namespace instance_id {

// static

bool InstanceIDProfileService::IsInstanceIDEnabled(Profile* profile) {

// Instance ID depends on GCM which has to been enabled.

- if (!gcm::GCMProfileService::IsGCMEnabled(profile))

+ if (!gcm::GCMProfileService::IsGCMEnabled(profile->GetPrefs()))

return false;

return InstanceIDDriver::IsInstanceIDEnabled();