Refactor network_time_test_utils

components/ssl_errors/error_classification_unittest.cc

 // Copyright 2015 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/ssl_errors/error_classification.h"
 
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
@@ skipping 21 matching lines @@
 const char kNetworkTimeHistogram[] = "interstitial.ssl.clockstate.network3";
 
 static std::unique_ptr<net::test_server::HttpResponse>
 NetworkErrorResponseHandler(const net::test_server::HttpRequest& request) {
   return std::unique_ptr<net::test_server::HttpResponse>(
       new net::test_server::RawHttpResponse("", ""));
 }
 
 }  // namespace
 
-class SSLErrorClassificationTest : public network_time::FieldTrialTest {
+class SSLErrorClassificationTest : public ::testing::Test {
  public:
-  SSLErrorClassificationTest() : network_time::FieldTrialTest() {}
+  SSLErrorClassificationTest()
+      : field_trial_test_(new network_time::FieldTrialTest()) {}
+  network_time::FieldTrialTest* field_trial_test() {
+    return field_trial_test_.get();
+  }
+
+ private:
+  std::unique_ptr<network_time::FieldTrialTest> field_trial_test_;
 };
 
 TEST_F(SSLErrorClassificationTest, TestNameMismatch) {
   scoped_refptr<net::X509Certificate> google_cert(
       net::X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(google_der), sizeof(google_der)));
   ASSERT_TRUE(google_cert.get());
   std::vector<std::string> dns_names_google;
   google_cert->GetDNSNames(&dns_names_google);
   ASSERT_EQ(1u, dns_names_google.size());  // ["www.google.com"]
@@ skipping 287 matching lines @@
   // Do this to be sure that |is_null| returns false.
   clock->Advance(base::TimeDelta::FromDays(111));
   tick_clock->Advance(base::TimeDelta::FromDays(222));
 
   base::MessageLoop loop;
   network_time::NetworkTimeTracker network_time_tracker(
       std::unique_ptr<base::Clock>(clock),
       std::unique_ptr<base::TickClock>(tick_clock), &pref_service,
       new net::TestURLRequestContextGetter(io_thread.task_runner()));
   network_time_tracker.SetTimeServerURLForTesting(test_server.GetURL("/"));
-  SetNetworkQueriesWithVariationsService(true, 0.0);
+  field_trial_test()->SetNetworkQueriesWithVariationsService(
+      true, 0.0, network_time::FieldTrialTest::ENABLE_FETCHES_ON_DEMAND);
 
   // No sync attempt.
   EXPECT_EQ(
       ssl_errors::ClockState::CLOCK_STATE_UNKNOWN,
       ssl_errors::GetClockState(base::Time::Now(), &network_time_tracker));
   histograms.ExpectTotalCount(kNetworkTimeHistogram, 1);
   histograms.ExpectBucketCount(
       kNetworkTimeHistogram,
       ssl_errors::NETWORK_CLOCK_STATE_UNKNOWN_NO_SYNC_ATTEMPT, 1);
 
@@ skipping 71 matching lines @@
   clock->Advance(base::TimeDelta::FromDays(1));
   // GetClockState() will fall back to the build time heuristic.
   ssl_errors::GetClockState(clock->Now(), &network_time_tracker);
   histograms.ExpectTotalCount(kNetworkTimeHistogram, 8);
   histograms.ExpectBucketCount(
       kNetworkTimeHistogram, ssl_errors::NETWORK_CLOCK_STATE_UNKNOWN_SYNC_LOST,
       1);
 
   io_thread.Stop();
 }