Revert of [GCM] Adding basic G-services handling

Revert of [GCM] Adding basic G-services handling (https://codereview.chromium.org/215363007/)

Reason for revert:
Broke a bunch of gcm_unit_tests on Mac:
https://codereview.chromium.org/215363007
http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%2010.6%20Tests%20%28dbg%29%284%29&number=39928
http://build.chromium.org/p/chromium.mac/buildstatus?builder=Mac%2010.7%20Tests%20%28dbg%29%284%29&number=22410

Original issue's description:
> Adding basic G-services handling
> 
> * extracting CheckinRequest::RequestInfo to better manage checkin parameters
> * adding G-services settings digest to RequestInfo of the checkin (will be sent with checkin request)
> * extracting G-services settings from checkin response
> * storing and loading of the G-services settings in GCM Store
> 
> BUG=359254
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261912
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=262242

TBR=zea@chromium.org,jianli@chromium.org,fgorski@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=359254

[Nico, 2014-04-08 02:40:50]

Created Revert of [GCM] Adding basic G-services handling

[commit-bot: I haz the power, 2014-04-08 02:41:13]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/thakis@chromium.org/225403019/1

[commit-bot: I haz the power, 2014-04-08 02:41:19]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-08 02:41:19]

Failed to apply patch for google_apis/gcm/engine/checkin_request.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file google_apis/gcm/engine/checkin_request.cc
  Hunk #1 FAILED at 46.
  Hunk #2 FAILED at 79.
  Hunk #3 FAILED at 153.
  Hunk #4 FAILED at 179.
  4 out of 4 hunks FAILED -- saving rejects to file
google_apis/gcm/engine/checkin_request.cc.rej

Patch:       google_apis/gcm/engine/checkin_request.cc
Index: google_apis/gcm/engine/checkin_request.cc
diff --git a/google_apis/gcm/engine/checkin_request.cc
b/google_apis/gcm/engine/checkin_request.cc
index
7addbebcad04b8ebe81bf7e6ec0e5ed2274335cb..94a6fc9e38ac8d8d27f9a7cdd0c69f5cd413695b
100644
--- a/google_apis/gcm/engine/checkin_request.cc
+++ b/google_apis/gcm/engine/checkin_request.cc
@@ -46,30 +46,21 @@
 
 }  // namespace
 
-CheckinRequest::RequestInfo::RequestInfo(
+CheckinRequest::CheckinRequest(
+    const CheckinRequestCallback& callback,
+    const net::BackoffEntry::Policy& backoff_policy,
+    const checkin_proto::ChromeBuildProto& chrome_build_proto,
     uint64 android_id,
     uint64 security_token,
-    const std::string& settings_digest,
     const std::vector<std::string>& account_ids,
-    const checkin_proto::ChromeBuildProto& chrome_build_proto)
-    : android_id(android_id),
-      security_token(security_token),
-      settings_digest(settings_digest),
-      account_ids(account_ids),
-      chrome_build_proto(chrome_build_proto) {
-}
-
-CheckinRequest::RequestInfo::~RequestInfo() {}
-
-CheckinRequest::CheckinRequest(
-    const RequestInfo& request_info,
-    const net::BackoffEntry::Policy& backoff_policy,
-    const CheckinRequestCallback& callback,
     net::URLRequestContextGetter* request_context_getter)
     : request_context_getter_(request_context_getter),
       callback_(callback),
       backoff_entry_(&backoff_policy),
-      request_info_(request_info),
+      chrome_build_proto_(chrome_build_proto),
+      android_id_(android_id),
+      security_token_(security_token),
+      account_ids_(account_ids),
       weak_ptr_factory_(this) {
 }
 
@@ -79,24 +70,21 @@
   DCHECK(!url_fetcher_.get());
 
   checkin_proto::AndroidCheckinRequest request;
-  request.set_id(request_info_.android_id);
-  request.set_security_token(request_info_.security_token);
+  request.set_id(android_id_);
+  request.set_security_token(security_token_);
   request.set_user_serial_number(kDefaultUserSerialNumber);
   request.set_version(kRequestVersionValue);
-  if (!request_info_.settings_digest.empty())
-    request.set_digest(request_info_.settings_digest);
 
   checkin_proto::AndroidCheckinProto* checkin = request.mutable_checkin();
-  checkin->mutable_chrome_build()->CopyFrom(request_info_.chrome_build_proto);
+  checkin->mutable_chrome_build()->CopyFrom(chrome_build_proto_);
 #if defined(CHROME_OS)
   checkin->set_type(checkin_proto::DEVICE_CHROME_OS);
 #else
   checkin->set_type(checkin_proto::DEVICE_CHROME_BROWSER);
 #endif
 
-  for (std::vector<std::string>::const_iterator iter =
-           request_info_.account_ids.begin();
-       iter != request_info_.account_ids.end();
+  for (std::vector<std::string>::const_iterator iter = account_ids_.begin();
+       iter != account_ids_.end();
        ++iter) {
     request.add_account_cookie("[" + *iter + "]");
   }
@@ -153,7 +141,7 @@
                << response_status << ". Checkin failed.";
     RecordCheckinStatusToUMA(response_status == net::HTTP_BAD_REQUEST ?
         HTTP_BAD_REQUEST : HTTP_UNAUTHORIZED);
-    callback_.Run(response_proto);
+    callback_.Run(0,0);
     return;
   }
 
@@ -179,7 +167,7 @@
   }
 
   RecordCheckinStatusToUMA(SUCCESS);
-  callback_.Run(response_proto);
+  callback_.Run(response_proto.android_id(), response_proto.security_token());
 }
 
 }  // namespace gcm

[Nico, 2014-04-08 02:43:11]

Looks like scottmg reverted this already. Also looks like the revert didn't help
:-/