Migrate more tests to ScopedFeatureList.

chrome/browser/ui/views/constrained_window_views_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 <memory>
 
 #include "base/macros.h"
+#include "base/test/scoped_feature_list.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h"
+#include "chrome/common/chrome_features.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
@@ skipping 170 matching lines @@
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_BACK,
                                               false, false, false, false));
   content::RunAllPendingInMessageLoop();
   content::WaitForLoadStop(web_contents);
 
   EXPECT_EQ(widget, dialog->GetWidget());
   EXPECT_EQ(GURL(chrome::kChromeUIVersionURL), web_contents->GetURL());
 
   // Pressing backspace should navigate back and close the dialog with the
   // Finch flag enabled.
-  base::FeatureList::ClearInstanceForTesting();
-  std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-  feature_list->InitializeFromCommandLine("BackspaceGoesBack", std::string());
-  base::FeatureList::SetInstance(std::move(feature_list));
+  base::test::ScopedFeatureList scoped_feature_list;
+  scoped_feature_list.InitAndEnableFeature(features::kBackspaceGoesBackFeature);
 
   EXPECT_TRUE(chrome::CanGoBack(browser()));
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_BACK,
                                               false, false, false, false));
   content::RunAllPendingInMessageLoop();
   content::WaitForLoadStop(web_contents);
 
   EXPECT_EQ(nullptr, dialog->GetWidget());
   EXPECT_EQ(original_url, web_contents->GetURL());
 }
 
 // Tests that the dialog closes when the escape key is pressed.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, ClosesOnEscape) {
 #if defined(OS_WIN)
   // TODO(msw): The widget is not made NULL on XP. http://crbug.com/177482
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return;
 #endif
 
   std::unique_ptr<TestDialog> dialog =
       ShowModalDialog(browser()->tab_strip_model()->GetActiveWebContents());
   EXPECT_TRUE(dialog->GetWidget()->IsVisible());
   EXPECT_TRUE(ui_test_utils::SendKeyPressSync(browser(), ui::VKEY_ESCAPE,
                                               false, false, false, false));
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(NULL, dialog->GetWidget());
 }