Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(629)

Unified Diff: content/browser/renderer_host/media/video_capture_browsertest.cc

Issue 2910843002: [Cleanup] Move all browsertests to use ScopedFeatureList to modify features
Patch Set: Ilya comments addressed Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_browsertest.cc
diff --git a/content/browser/renderer_host/media/video_capture_browsertest.cc b/content/browser/renderer_host/media/video_capture_browsertest.cc
index e4c37d1e64a1cce636638653185b47ece3eefd92..4d2ac4b23a9e00b08b25b65f7eda8a0235e69fd8 100644
--- a/content/browser/renderer_host/media/video_capture_browsertest.cc
+++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/command_line.h"
#include "base/run_loop.h"
+#include "base/test/scoped_feature_list.h"
#include "build/build_config.h"
#include "content/browser/browser_main_loop.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
@@ -145,6 +146,14 @@ class VideoCaptureBrowserTest : public ContentBrowserTest,
video_capture_manager_->Close(session_id_);
}
+ void SetUp() override {
+ if (params_.use_mojo_service) {
+ scoped_feature_list_.InitAndEnableFeature(
+ video_capture::kMojoVideoCapture);
+ }
+ ContentBrowserTest::SetUp();
+ }
+
protected:
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitchASCII(switches::kUseFakeDeviceForMediaStream,
@@ -157,10 +166,6 @@ class VideoCaptureBrowserTest : public ContentBrowserTest,
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kDisableAcceleratedMjpegDecode);
}
- if (params_.use_mojo_service) {
- base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
- switches::kEnableFeatures, video_capture::kMojoVideoCapture.name);
- }
}
// This cannot be part of an override of SetUp(), because at the time when
@@ -211,6 +216,7 @@ class VideoCaptureBrowserTest : public ContentBrowserTest,
MockMediaStreamProviderListener mock_stream_provider_listener_;
MockVideoCaptureControllerEventHandler mock_controller_event_handler_;
base::WeakPtr<VideoCaptureController> controller_;
+ base::test::ScopedFeatureList scoped_feature_list_;
};
IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, StartAndImmediatelyStop) {

Powered by Google App Engine
This is Rietveld 408576698