Merge to M39: [GCM] Updating GCM Status Syncer to the new Experiment Status pb

components/gcm_driver/gcm_channel_status_request.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/gcm_driver/gcm_channel_status_request.h"
 
 #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 {
 
 namespace {
 
 const char kRequestContentType[] = "application/octet-stream";
 const char kGCMChannelTag[] = "gcm_channel";
 const int kDefaultPollIntervalSeconds = 60 * 60;  // 60 minutes.
 const int kMinPollIntervalSeconds = 30 * 60;  // 30 minutes.
@@ skipping 24 matching lines @@
 // static
 int GCMChannelStatusRequest::min_poll_interval_seconds() {
   return kMinPollIntervalSeconds;
 }
 
 void GCMChannelStatusRequest::Start() {
   DCHECK(!url_fetcher_.get());
 
   GURL request_url(channel_status_request_url_);
 
-  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));
 
   url_fetcher_.reset(
       net::URLFetcher::Create(request_url, net::URLFetcher::POST, this));
   url_fetcher_->SetRequestContext(request_context_getter_.get());
   url_fetcher_->AddExtraRequestHeader("User-Agent: " + user_agent_);
   url_fetcher_->SetUploadData(kRequestContentType, upload_data);
   url_fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
@@ skipping 21 matching lines @@
     return false;
   }
 
   std::string response_string;
   if (!source->GetResponseAsString(&response_string) ||
       response_string.empty()) {
     LOG(ERROR) << "GCM channel response failed to be retrieved.";
     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();
+  if (response_proto.experiment_size() == 1 &&
+      response_proto.experiment(0).has_gcm_channel() &&
+      response_proto.experiment(0).gcm_channel().has_enabled()) {
+    enabled = response_proto.experiment(0).gcm_channel().enabled();
   }
 
   int poll_interval_seconds;
   if (response_proto.has_poll_interval_seconds())
     poll_interval_seconds = response_proto.poll_interval_seconds();
   else
     poll_interval_seconds = kDefaultPollIntervalSeconds;
   if (poll_interval_seconds < kMinPollIntervalSeconds)
     poll_interval_seconds = kMinPollIntervalSeconds;
 
@@ skipping 18 matching lines @@
                    weak_ptr_factory_.GetWeakPtr(),
                    false),
         backoff_entry_.GetTimeUntilRelease());
     return;
   }
 
   Start();
 }
 
 }  // namespace gcm