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

Unified Diff: components/gcm_driver/gcm_channel_status_request_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
Index: components/gcm_driver/gcm_channel_status_request_unittest.cc
diff --git a/components/gcm_driver/gcm_channel_status_request_unittest.cc b/components/gcm_driver/gcm_channel_status_request_unittest.cc
index 961ca4e7c047e812a69592389a04f8a2492abf6c..e165ca49e33c13714c3dab8f3b2e78d616fbee35 100644
--- a/components/gcm_driver/gcm_channel_status_request_unittest.cc
+++ b/components/gcm_driver/gcm_channel_status_request_unittest.cc
@@ -4,9 +4,10 @@
#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 {
@@ -69,9 +70,13 @@ void GCMChannelStatusRequestTest::SetResponseStatusAndString(
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)
« no previous file with comments | « components/gcm_driver/gcm_channel_status_request.cc ('k') | components/gcm_driver/gcm_driver_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698