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

Unified Diff: components/gcm_driver/gcm_driver_desktop_unittest.cc

Issue 1854093002: Enable InstanceID field trial by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@iid3test
Patch Set: Rebase Created 4 years, 8 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_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 9037b129e96a23be74715c6b3d7c68858069a798..c5a8e6193adee653771e5232b9395126ae140041 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -11,7 +11,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/location.h"
#include "base/macros.h"
-#include "base/metrics/field_trial.h"
#include "base/run_loop.h"
#include "base/strings/string_util.h"
#include "base/test/test_simple_task_runner.h"
@@ -167,7 +166,6 @@ class GCMDriverTest : public testing::Test {
TestingPrefServiceSimple prefs_;
base::MessageLoopForUI message_loop_;
base::Thread io_thread_;
- base::FieldTrialList field_trial_list_;
scoped_ptr<GCMDriverDesktop> driver_;
scoped_ptr<FakeGCMAppHandler> gcm_app_handler_;
scoped_ptr<FakeGCMConnectionObserver> gcm_connection_observer_;
@@ -187,7 +185,6 @@ class GCMDriverTest : public testing::Test {
GCMDriverTest::GCMDriverTest()
: io_thread_("IOThread"),
- field_trial_list_(NULL),
registration_result_(GCMClient::UNKNOWN_ERROR),
send_result_(GCMClient::UNKNOWN_ERROR),
unregistration_result_(GCMClient::UNKNOWN_ERROR) {
@@ -950,9 +947,6 @@ void GCMChannelStatusSyncerTest::SetUp() {
GCMDriverTest::SetUp();
url_fetcher_factory_.set_remove_fetcher_on_delete(true);
-
- // Turn on all-user support.
- ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("GCM", "Enabled"));
}
void GCMChannelStatusSyncerTest::CompleteGCMChannelStatusRequest(

Powered by Google App Engine
This is Rietveld 408576698