Update NetworkTimeQueries field trial config

components/network_time/network_time_test_utils.cc

 // Copyright 2016 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 "components/network_time/network_time_test_utils.h"
 
 #include "base/feature_list.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 31 matching lines @@
     const net::test_server::HttpRequest& request) {
   net::test_server::BasicHttpResponse* response =
       new net::test_server::BasicHttpResponse();
   response->set_code(net::HTTP_OK);
   response->set_content(kGoodTimeResponseBody);
   response->AddCustomHeader("x-cup-server-proof",
                             kGoodTimeResponseServerProofHeader);
   return std::unique_ptr<net::test_server::HttpResponse>(response);
 }
 
+FieldTrialTest::FieldTrialTest() {}
+
 FieldTrialTest::~FieldTrialTest() {}
 
-FieldTrialTest* FieldTrialTest::CreateForUnitTest() {
-  FieldTrialTest* test = new FieldTrialTest();
-  test->create_field_trial_list_ = true;
-  return test;
-}
-
-FieldTrialTest* FieldTrialTest::CreateForBrowserTest() {
-  FieldTrialTest* test = new FieldTrialTest();
-  test->create_field_trial_list_ = false;
-  return test;
-}
-
 void FieldTrialTest::SetNetworkQueriesWithVariationsService(
     bool enable,
     float query_probability,
     NetworkTimeTracker::FetchBehavior fetch_behavior) {
   const std::string kTrialName = "Trial";
   const std::string kGroupName = "group";
   const base::Feature kFeature{"NetworkTimeServiceQuerying",
                                base::FEATURE_DISABLED_BY_DEFAULT};
 
   // Clear all the things.
@@ skipping 22 matching lines @@
 
   // There are 3 things here: a FieldTrial, a FieldTrialList, and a
   // FeatureList.  Don't get confused!  The FieldTrial is reference-counted,
   // and a reference is held by the FieldTrialList.  The FieldTrialList and
   // FeatureList are both singletons.  The authorized way to reset the former
   // for testing is to destruct it (above).  The latter, by contrast, should
   // should already start in a clean state and can be manipulated via the
   // ScopedFeatureList helper class. If this comment was useful to you
   // please send me a postcard.
 
-  if (create_field_trial_list_) {
-    field_trial_list_.reset();  // Averts a CHECK fail in constructor below.
-    field_trial_list_.reset(new base::FieldTrialList(
-        base::MakeUnique<base::MockEntropyProvider>()));
-  }
+  field_trial_list_.reset();  // Averts a CHECK fail in constructor below.

[meacer, 2017/01/23 21:35:54]

nit: Is this still needed?

[estark, 2017/01/23 23:42:38]

Err. Probably. I'll try removing it and see if the bots complain.

+  field_trial_list_.reset(
+      new base::FieldTrialList(base::MakeUnique<base::MockEntropyProvider>()));
+
   // refcounted, and reference held by the singleton FieldTrialList.
   base::FieldTrial* trial = base::FieldTrialList::FactoryGetFieldTrial(
       kTrialName, 100, kGroupName, 1971, 1, 1,
       base::FieldTrial::SESSION_RANDOMIZED, nullptr /* default_group_number */);
   ASSERT_TRUE(
       variations::AssociateVariationParams(kTrialName, kGroupName, params));
 
   std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
   feature_list->RegisterFieldTrialOverride(
       kFeature.name, enable ? base::FeatureList::OVERRIDE_ENABLE_FEATURE
                             : base::FeatureList::OVERRIDE_DISABLE_FEATURE,
       trial);
   scoped_feature_list_.reset(new base::test::ScopedFeatureList);
   scoped_feature_list_->InitWithFeatureList(std::move(feature_list));
 }
 
-FieldTrialTest::FieldTrialTest() {}
-
 }  // namespace network_time