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

components/gcm_driver/gcm_channel_status_request_unittest.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 "base/message_loop/message_loop.h"
 #include "components/gcm_driver/gcm_channel_status_request.h"
-#include "components/gcm_driver/proto/gcm_channel_status.pb.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
+#include "sync/protocol/experiment_status.pb.h"
+#include "sync/protocol/experiments_specifics.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 class GCMChannelStatusRequestTest : public testing::Test {
  public:
   GCMChannelStatusRequestTest();
   virtual ~GCMChannelStatusRequestTest();
 
  protected:
@@ skipping 44 matching lines @@
     net::HttpStatusCode status_code,
     const std::string& response_body) {
   net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   fetcher->set_response_code(status_code);
   fetcher->SetResponseString(response_body);
 }
 
 void GCMChannelStatusRequestTest::SetResponseProtoData(
     GCMStatus status, int poll_interval_seconds) {
-  gcm_proto::ExperimentStatusResponse response_proto;
-  if (status != NOT_SPECIFIED)
-    response_proto.mutable_gcm_channel()->set_enabled(status == GCM_ENABLED);
+  sync_pb::ExperimentStatusResponse response_proto;
+  if (status != NOT_SPECIFIED) {
+    sync_pb::ExperimentsSpecifics* experiment_specifics =
+        response_proto.add_experiment();
+    experiment_specifics->mutable_gcm_channel()->set_enabled(status ==
+                                                             GCM_ENABLED);
+  }
 
   // Zero |poll_interval_seconds| means the optional field is not set.
   if (poll_interval_seconds)
     response_proto.set_poll_interval_seconds(poll_interval_seconds);
 
   std::string response_string;
   response_proto.SerializeToString(&response_string);
   SetResponseStatusAndString(net::HTTP_OK, response_string);
 }
 
@@ skipping 102 matching lines @@
   StartRequest();
   SetResponseProtoData(GCM_DISABLED, poll_interval_seconds);
   CompleteFetch();
 
   EXPECT_TRUE(request_callback_invoked_);
   EXPECT_FALSE(enabled_);
   EXPECT_EQ(poll_interval_seconds, poll_interval_seconds_);
 }
 
 }  // namespace gcm