| Index: chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| index 5be56ec5f01caf0a28c58f76bfe8041073cec216..c17e938a0ee303579de1eacd7ff014191fdff1f5 100644
|
| --- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| +++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/memory/ptr_util.h"
|
| #include "base/path_service.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "base/test/scoped_feature_list.h"
|
| #include "base/threading/thread_task_runner_handle.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| @@ -448,14 +449,13 @@ class SupervisedUserServiceExtensionTest
|
|
|
| protected:
|
| void InitSupervisedUserInitiatedExtensionInstallFeature(bool enabled) {
|
| - base::FeatureList::ClearInstanceForTesting();
|
| - std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| if (enabled) {
|
| - feature_list->InitializeFromCommandLine(
|
| - "SupervisedUserInitiatedExtensionInstall", std::string());
|
| + scoped_feature_list_.InitAndEnableFeature(
|
| + supervised_users::kSupervisedUserInitiatedExtensionInstall);
|
| }
|
| - base::FeatureList::SetInstance(std::move(feature_list));
|
| }
|
| +
|
| + base::test::ScopedFeatureList scoped_feature_list_;
|
| };
|
|
|
| TEST_F(SupervisedUserServiceExtensionTest,
|
|
|