[Cleanup] Transition NetworkTime browser tests to use a ScopedFeatureList.

chrome/browser/ssl/ssl_browser_tests.cc

 // Copyright (c) 2012 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 <utility>
 
 #include "base/base64.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 3260 matching lines @@
 // request, and it allows the user to configure the experimental
 // parameters of the NetworkTimeTracker. Expects only one network time
 // request to be issued during the test.
 class SSLNetworkTimeBrowserTest : public SSLUITest {
  public:
   SSLNetworkTimeBrowserTest() : SSLUITest(), interceptor_(nullptr) {}
   ~SSLNetworkTimeBrowserTest() override {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(
-        switches::kEnableFeatures,
-        std::string(network_time::kNetworkTimeServiceQuerying.name) +
-            "<SSLNetworkTimeBrowserTestFieldTrial");
-    command_line->AppendSwitchASCII(
         switches::kForceFieldTrials,
         "SSLNetworkTimeBrowserTestFieldTrial/Enabled/");
     command_line->AppendSwitchASCII(
         variations::switches::kForceFieldTrialParams,
         "SSLNetworkTimeBrowserTestFieldTrial.Enabled:FetchBehavior/"
         "on-demand-only");
   }
 
   void SetUpOnMainThread() override {
     SSLUITest::SetUpOnMainThread();
+    scoped_feature_list_.InitFromCommandLine(
+        std::string(network_time::kNetworkTimeServiceQuerying.name) +
+            "<SSLNetworkTimeBrowserTestFieldTrial",
+        std::string());
     SetUpNetworkTimeServer();
   }
 
   void TearDownOnMainThread() override {
     content::BrowserThread::PostTask(content::BrowserThread::IO, FROM_HERE,
                                      base::Bind(&CleanUpOnIOThread));
   }
 
  protected:
   void SetUpNetworkTimeServer() {
@@ skipping 18 matching lines @@
   void CheckTimeQueryPending() {
     base::Time unused_time;
     base::TimeDelta unused_uncertainty;
     ASSERT_EQ(network_time::NetworkTimeTracker::NETWORK_TIME_FIRST_SYNC_PENDING,
               g_browser_process->network_time_tracker()->GetNetworkTime(
                   &unused_time, &unused_uncertainty));
   }
 
  private:
   DelayedNetworkTimeInterceptor* interceptor_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLNetworkTimeBrowserTest);
 };
 
 // Tests that if an on-demand network time fetch returns that the clock
 // is okay, a normal SSL interstitial is shown.
 IN_PROC_BROWSER_TEST_F(SSLNetworkTimeBrowserTest, OnDemandFetchClockOk) {
   ASSERT_TRUE(https_server_expired_.Start());
   // Use a testing clock set to the time that GoodTimeResponseHandler
   // returns, to simulate the system clock matching the network time.
@@ skipping 1411 matching lines @@
 
 // Visit a page over https that contains a frame with a redirect.
 
 // XMLHttpRequest insecure content in synchronous mode.
 
 // XMLHttpRequest insecure content in asynchronous mode.
 
 // XMLHttpRequest over bad ssl in synchronous mode.
 
 // XMLHttpRequest over OK ssl in synchronous mode.