| Index: components/gcm_driver/gcm_driver_desktop_unittest.cc
|
| diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc
|
| index 4ce060ca70681d8dbf1912b2eab7046e6c4345b7..849fc019103429802688493256e51b0671c5f08e 100644
|
| --- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
|
| +++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
|
| @@ -25,11 +25,12 @@
|
| #include "components/gcm_driver/gcm_channel_status_syncer.h"
|
| #include "components/gcm_driver/gcm_client_factory.h"
|
| #include "components/gcm_driver/gcm_connection_observer.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_fetcher_delegate.h"
|
| #include "net/url_request/url_request_context_getter.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 {
|
| @@ -1020,8 +1021,10 @@ void GCMChannelStatusSyncerTest::SetUp() {
|
|
|
| void GCMChannelStatusSyncerTest::CompleteGCMChannelStatusRequest(
|
| bool enabled, int poll_interval_seconds) {
|
| - gcm_proto::ExperimentStatusResponse response_proto;
|
| - response_proto.mutable_gcm_channel()->set_enabled(enabled);
|
| + sync_pb::ExperimentStatusResponse response_proto;
|
| + sync_pb::ExperimentsSpecifics* experiment_specifics =
|
| + response_proto.add_experiment();
|
| + experiment_specifics->mutable_gcm_channel()->set_enabled(enabled);
|
|
|
| if (poll_interval_seconds)
|
| response_proto.set_poll_interval_seconds(poll_interval_seconds);
|
|
|