[GCM] Updating GCM Status Syncer to the new Experiment Status pb

components/gcm_driver/gcm_channel_status_request.cc

Index: components/gcm_driver/gcm_channel_status_request.cc
diff --git a/components/gcm_driver/gcm_channel_status_request.cc b/components/gcm_driver/gcm_channel_status_request.cc
index fd405d1b8c260f8ffdf6e47761d96710e9e308d7..8e6e7bc7ef5c0c9e7848867d80aa796317fddcba 100644
--- a/components/gcm_driver/gcm_channel_status_request.cc
+++ b/components/gcm_driver/gcm_channel_status_request.cc
@@ -7,12 +7,12 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "components/gcm_driver/gcm_backoff_policy.h"
-#include "components/gcm_driver/proto/gcm_channel_status.pb.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
+#include "sync/protocol/experiment_status.pb.h"
 #include "url/gurl.h"
 
 namespace gcm {
@@ -55,7 +55,7 @@ void GCMChannelStatusRequest::Start() {
 
   GURL request_url(kGCMChannelStatusRequestURL);
 
-  gcm_proto::ExperimentStatusRequest proto_data;
+  sync_pb::ExperimentStatusRequest proto_data;
   proto_data.add_experiment_name(kGCMChannelTag);
   std::string upload_data;
   DCHECK(proto_data.SerializeToString(&upload_data));
@@ -96,16 +96,19 @@ bool GCMChannelStatusRequest::ParseResponse(const net::URLFetcher* source) {
     return false;
   }
 
-  gcm_proto::ExperimentStatusResponse response_proto;
+  sync_pb::ExperimentStatusResponse response_proto;
   if (!response_proto.ParseFromString(response_string)) {
     LOG(ERROR) << "GCM channel response failed to be parse as proto.";
     return false;
   }
 
   bool enabled = true;
-  if (response_proto.has_gcm_channel() &&
-      response_proto.gcm_channel().has_enabled()) {
-    enabled = response_proto.gcm_channel().enabled();
+  for (int i = 0; i < response_proto.experiment_size(); ++i) {

[Nicolas Zea, 2014/10/08 01:02:20]

we're only ever going to get back the experiments we request right? Do we need
to iterate in that case? We can update this code if/when we support more
experiments.

Checking has_gcm_channel seems fine though as a safety measure.

[fgorski, 2014/10/08 16:43:42]

Done.

+    if (response_proto.experiment(i).has_gcm_channel() &&
+        response_proto.experiment(i).gcm_channel().has_enabled()) {
+      enabled = response_proto.experiment(i).gcm_channel().enabled();
+      break;
+    }
   }
 
   int poll_interval_seconds;