google_apis/gcm/engine/instance_id_get_token_request_handler.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: google_apis/gcm/engine/instance_id_get_token_request_handler.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 jianli's review comments Created 4 years, 4 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

« google_apis/gcm/engine/gcm_request_test_base.h ('K') | « google_apis/gcm/engine/instance_id_delete_token_request_handler.cc ('k') | google_apis/gcm/engine/registration_request.h » ('j') | google_apis/gcm/engine/registration_request.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: google_apis/gcm/engine/instance_id_get_token_request_handler.cc

diff --git a/google_apis/gcm/engine/instance_id_get_token_request_handler.cc b/google_apis/gcm/engine/instance_id_get_token_request_handler.cc

index 187db61df2c7fff0b5333cb997068603483eee56..3ebda2079b31c023b7d5f4ab7a87f8232ce0c22c 100644

--- a/google_apis/gcm/engine/instance_id_get_token_request_handler.cc

+++ b/google_apis/gcm/engine/instance_id_get_token_request_handler.cc

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

// Request constants.

const char kAuthorizedEntityKey[] = "sender";

-const char kSubtypeKey[] = "X-subtype";

const char kGMSVersionKey[] = "gmsv";

const char kInstanceIDKey[] = "appid";

const char kScopeKey[] = "scope";

@@ -51,9 +50,6 @@ void InstanceIDGetTokenRequestHandler::BuildRequestBody(std::string* body){

BuildFormEncoding(kGMSVersionKey, base::IntToString(gcm_version_), body);

BuildFormEncoding(kInstanceIDKey, instance_id_, body);

BuildFormEncoding(kAuthorizedEntityKey, authorized_entity_, body);

- // TODO(jianli): To work around server bug. To be removed when the server fix

- // is deployed.

- BuildFormEncoding(kSubtypeKey, authorized_entity_, body);

}

void InstanceIDGetTokenRequestHandler::ReportUMAs(