Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Unified Diff: components/gcm_driver/gcm_driver_desktop_unittest.cc

Issue 635093002: [GCM] Updating GCM Status Syncer to the new Experiment Status pb (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing CR comments Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/gcm_driver/gcm_channel_status_request_unittest.cc ('k') | components/gcm_driver/proto/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « components/gcm_driver/gcm_channel_status_request_unittest.cc ('k') | components/gcm_driver/proto/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698