Migrate more tests to ScopedFeatureList.

content/browser/loader/async_revalidation_manager_browsertest.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 <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_feature_list.h"
 #include "content/public/common/browser_side_navigation_policy.h"
+#include "content/public/common/content_features.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace content {
 
 namespace {
 
 using net::test_server::HttpResponse;
 using net::test_server::HttpRequest;
 using net::test_server::BasicHttpResponse;
 
 const char kCountedHtmlPath[] = "/counted.html";
 const char kCookieHtmlPath[] = "/cookie.html";
 
 class AsyncRevalidationManagerBrowserTest : public ContentBrowserTest {
  protected:
   AsyncRevalidationManagerBrowserTest() {}
   ~AsyncRevalidationManagerBrowserTest() override {}
 
   void SetUp() override {
-    base::FeatureList::ClearInstanceForTesting();
-    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-    feature_list->InitializeFromCommandLine(
-        "StaleWhileRevalidate2", std::string());
-    base::FeatureList::SetInstance(std::move(feature_list));
+    scoped_feature_list_.InitAndEnableFeature(features::kStaleWhileRevalidate);
 
     ASSERT_TRUE(embedded_test_server()->InitializeAndListen());
     ContentBrowserTest::SetUp();
   }
 
   void SetUpOnMainThread() override {
     embedded_test_server()->StartAcceptingConnections();
   }
 
   base::RunLoop* run_loop() { return &run_loop_; }
@@ skipping 83 matching lines @@
     // A validator is needed for revalidations, and hence
     // stale-while-revalidate, to work.
     std::string etag = base::StringPrintf(
         "\"AsyncRevalidationManagerBrowserTest%d\"", requests_counted_);
     http_response->AddCustomHeader("ETag", etag);
     return http_response;
   }
 
   base::RunLoop run_loop_;
   int requests_counted_ = 0;
+  base::test::ScopedFeatureList scoped_feature_list_;
 
   DISALLOW_COPY_AND_ASSIGN(AsyncRevalidationManagerBrowserTest);
 };
 
 // Verify that the "Cache-Control: stale-while-revalidate" directive correctly
 // triggers an async revalidation.
 IN_PROC_BROWSER_TEST_F(AsyncRevalidationManagerBrowserTest,
                        StaleWhileRevalidateIsApplied) {
   // PlzNavigate: Stale while revalidate is disabled.
   // TODO(clamy): Re-enable the test when there is support.
@@ skipping 68 matching lines @@
   NavigateToURL(shell(), GURL("about:blank"));
 
   // The page will load from the cache, then when the async revalidation
   // completes the cookie will update.
   EXPECT_TRUE(TitleBecomes(url, "PASS"));
 }
 
 }  // namespace
 
 }  // namespace content