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

chrome/browser/policy/policy_browsertest.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 <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
 #include <string>
@@ skipping 15 matching lines @@
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/test/test_file_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 4317 matching lines @@
     }
   }
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 class NetworkTimePolicyTest : public PolicyTest {
  public:
   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 {
+    PolicyTest::SetUpOnMainThread();
+    scoped_feature_list_.InitFromCommandLine(
+        std::string(network_time::kNetworkTimeServiceQuerying.name) +
+            "<SSLNetworkTimeBrowserTestFieldTrial",
+        std::string());
+  }
+
   // A request handler that returns a dummy response and counts the number of
   // times it is called.
   std::unique_ptr<net::test_server::HttpResponse> CountingRequestHandler(
       const net::test_server::HttpRequest& request) {
     net::test_server::BasicHttpResponse* response =
         new net::test_server::BasicHttpResponse();
     num_requests_++;
     response->set_code(net::HTTP_OK);
     response->set_content(
         ")]}'\n"
         "{\"current_time_millis\":1461621971825,\"server_nonce\":-6."
         "006853099049523E85}");
     response->AddCustomHeader("x-cup-server-proof", "dead:beef");
     return std::unique_ptr<net::test_server::HttpResponse>(response);
   }
 
   uint32_t num_requests() { return num_requests_; }
 
  private:
   uint32_t num_requests_ = 0;
+  base::test::ScopedFeatureList scoped_feature_list_;
 };
 
 IN_PROC_BROWSER_TEST_F(NetworkTimePolicyTest, NetworkTimeQueriesDisabled) {
   // Set a policy to disable network time queries.
   PolicyMap policies;
   policies.Set(key::kBrowserNetworkTimeQueriesEnabled, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
                base::MakeUnique<base::Value>(false), nullptr);
   UpdateProviderPolicy(policies);
 
@@ skipping 22 matching lines @@
                POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
                base::MakeUnique<base::Value>(true), nullptr);
   UpdateProviderPolicy(policies);
   ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL("/"));
   interstitial_page = tab->GetInterstitialPage();
   ASSERT_TRUE(interstitial_page);
   EXPECT_EQ(1u, num_requests());
 }
 
 }  // namespace policy