| Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| index 563def30e93677cca47f534ee790474db04d3767..c37cf06c984b1af66ce5992c8f4b5fb4acc8b534 100644
|
| --- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| +++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view_interactive_uitest.cc
|
| @@ -7,18 +7,17 @@
|
| #include <utility>
|
|
|
| #include "base/command_line.h"
|
| -#include "base/feature_list.h"
|
| #include "base/macros.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/metrics/histogram_samples.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "base/test/scoped_feature_list.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/passwords/manage_passwords_test.h"
|
| #include "chrome/browser/ui/passwords/passwords_model_delegate.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/browser/ui/views/frame/browser_view.h"
|
| -#include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
|
| #include "chrome/browser/ui/views/passwords/manage_passwords_icon_views.h"
|
| #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
|
| #include "chrome/test/base/interactive_test_utils.h"
|
| @@ -284,11 +283,8 @@ IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, TwoTabsWithBubble) {
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(ManagePasswordsBubbleViewTest, AutoSignin) {
|
| - base::FeatureList::ClearInstanceForTesting();
|
| - std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| - feature_list->InitializeFromCommandLine(
|
| - features::kCredentialManagementAPI.name, std::string());
|
| - base::FeatureList::SetInstance(std::move(feature_list));
|
| + base::test::ScopedFeatureList scoped_feature_list;
|
| + scoped_feature_list.InitAndEnableFeature(features::kCredentialManagementAPI);
|
| ASSERT_TRUE(base::FeatureList::IsEnabled(features::kCredentialManagementAPI));
|
|
|
| test_form()->origin = GURL("https://example.com");
|
|
|