chrome/browser/extensions/extension_gcm_app_handler_unittest.cc - Issue 2111973002: Add support for GCM subtypes to desktop Instance ID implementation

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/extensions/extension_gcm_app_handler_unittest.cc

Issue 2111973002: Add support for GCM subtypes to desktop Instance ID implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid9push

Patch Set: address most of peter's concerns Created 4 years, 5 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/extensions/extension_gcm_app_handler_unittest.cc

diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

index 3fec12467cae1d9cc23a061f3ec83d5629a44064..1beec2bb78edd37c69fcb6d2c76b697614cd9c9c 100644

--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc

@@ -34,6 +34,7 @@

#include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

#include "chrome/common/channel_info.h"

#include "chrome/common/chrome_paths.h"

+#include "chrome/common/chrome_version.h"

#include "chrome/test/base/testing_profile.h"

#include "components/gcm_driver/fake_gcm_app_handler.h"

#include "components/gcm_driver/fake_gcm_client.h"

@@ -210,7 +211,7 @@ class ExtensionGCMAppHandlerTest : public testing::Test {

base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));

return base::WrapUnique(new gcm::GCMProfileService(

profile->GetPrefs(), profile->GetPath(), profile->GetRequestContext(),

- chrome::GetChannel(),

+ PRODUCT_SHORTNAME_STRING, chrome::GetChannel(),

std::unique_ptr<ProfileIdentityProvider>(new ProfileIdentityProvider(

SigninManagerFactory::GetForProfile(profile),

ProfileOAuth2TokenServiceFactory::GetForProfile(profile),

« no previous file with comments | « chrome/browser/extensions/extension_gcm_app_handler.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | components/gcm_driver.gypi » ('J')