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

Unified Diff: google_apis/gcm/tools/mcs_probe.cc

Issue 215363007: [GCM] Adding basic G-services handling (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/gcm_client_impl.cc ('K') | « google_apis/gcm/gcm_client_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gcm/tools/mcs_probe.cc
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc
index 157a73f355f9289f9c6aa312d2d04667b3f7bdf1..c13dacc3f3d509806388bb617e08a76a61cd88ad 100644
--- a/google_apis/gcm/tools/mcs_probe.cc
+++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -210,7 +210,8 @@ class MCSProbe {
void LoadCallback(scoped_ptr<GCMStore::LoadResult> load_result);
void UpdateCallback(bool success);
void ErrorCallback();
- void OnCheckInCompleted(uint64 android_id, uint64 secret);
+ void OnCheckInCompleted(
+ const checkin_proto::AndroidCheckinResponse& checkin_response);
void StartMCSLogin();
base::DefaultClock clock_;
@@ -435,13 +436,16 @@ void MCSProbe::CheckIn() {
checkin_request_->Start();
}
-void MCSProbe::OnCheckInCompleted(uint64 android_id, uint64 secret) {
+void MCSProbe::OnCheckInCompleted(
+ const checkin_proto::AndroidCheckinResponse& checkin_response) {
LOG(INFO) << "Check-in request completion "
- << (android_id ? "success!" : "failure!");
- if (!android_id || !secret)
+ << (checkin_response.has_android_id() ? "success!" : "failure!");
fgorski 2014/03/28 14:30:51 add a check if android ID is 0 or not.
fgorski 2014/03/29 01:09:32 Done.
+ if (!checkin_response.has_android_id() ||
+ !checkin_response.has_security_token())
return;
- android_id_ = android_id;
- secret_ = secret;
+
+ android_id_ = checkin_response.android_id();
+ secret_ = checkin_response.security_token();
gcm_store_->SetDeviceCredentials(android_id_,
secret_,
« google_apis/gcm/gcm_client_impl.cc ('K') | « google_apis/gcm/gcm_client_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698