Migrate more tests to ScopedFeatureList.

content/browser/media/session/media_session_impl_visibility_browsertest.cc

 // Copyright 2016 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 <tuple>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/single_thread_task_runner.h"
+#include "base/test/scoped_feature_list.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/media/session/media_session_impl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.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/public/test/test_navigation_observer.h"
 #include "content/shell/browser/shell.h"
 #include "media/base/media_switches.h"
@@ skipping 67 matching lines @@
                        base::Unretained(this)));
   }
 
   void TearDownOnMainThread() override {
     // Unsubscribe the callback subscription before tearing down, so that the
     // CallbackList in MediaSession will be empty when it is destroyed.
     media_session_state_callback_subscription_.reset();
   }
 
   void EnableDisableResumingBackgroundVideos(bool enable) {
-    std::string enabled_features;
-    std::string disabled_features;
     if (enable)
-      enabled_features = media::kResumeBackgroundVideo.name;
+      scoped_feature_list_.InitAndEnableFeature(media::kResumeBackgroundVideo);
     else
-      disabled_features = media::kResumeBackgroundVideo.name;
-
-    std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
-    feature_list->InitializeFromCommandLine(enabled_features,
-                                            disabled_features);
-    base::FeatureList::ClearInstanceForTesting();
-    base::FeatureList::SetInstance(std::move(feature_list));
+      scoped_feature_list_.InitAndDisableFeature(media::kResumeBackgroundVideo);
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(
         switches::kDisableGestureRequirementForMediaPlayback);
 #if !defined(OS_ANDROID)
     command_line->AppendSwitch(switches::kEnableDefaultMediaSession);
 #endif  // !defined(OS_ANDROID)
 
     VisibilityTestData params = GetVisibilityTestData();
@@ skipping 130 matching lines @@
   // MessageLoopRunners can accept Quit() before calling Run(), thus the state
   // change can still be captured before waiting. For example, the MediaSession
   // might go active immediately after calling HTMLMediaElement.play(). A test
   // can listen to the state change before calling play(), and then wait for the
   // state change after play().
   std::map<MediaSessionImpl::State, scoped_refptr<MessageLoopRunner>>
       media_session_state_loop_runners_;
   std::unique_ptr<
       base::CallbackList<void(MediaSessionImpl::State)>::Subscription>
       media_session_state_callback_subscription_;
+  base::test::ScopedFeatureList scoped_feature_list_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaSessionImplVisibilityBrowserTest);
 };
 
 namespace {
 
 VisibilityTestData kTestParams[] = {
     {MediaSuspend::ENABLED, BackgroundResuming::DISABLED,
      SessionState::SUSPENDED, SessionState::INACTIVE},
     {MediaSuspend::ENABLED, BackgroundResuming::DISABLED, SessionState::ACTIVE,
@@ skipping 28 matching lines @@
   HideTab();
   CheckSessionStateAfterHide();
 }
 
 INSTANTIATE_TEST_CASE_P(MediaSessionImplVisibilityBrowserTestInstances,
                         MediaSessionImplVisibilityBrowserTest,
                         ::testing::Combine(::testing::ValuesIn(kTestParams),
                                            ::testing::ValuesIn(kPipelines)));
 
 }  // namespace content