| Index: content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| index 8d604516f8ead779478dbd0a73876f7ace452a1e..10c17d06e3098150c47e0d8cb03a0bac8814a23a 100644
|
| --- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
|
| @@ -724,68 +724,4 @@ IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
|
| ExecuteJavascriptAndWaitForOk(call);
|
| }
|
|
|
| -namespace {
|
| -
|
| -struct UserMediaSizes {
|
| - int min_width;
|
| - int max_width;
|
| - int min_height;
|
| - int max_height;
|
| - int min_frame_rate;
|
| - int max_frame_rate;
|
| -};
|
| -
|
| -} // namespace
|
| -
|
| -class WebRtcConstraintsBrowserTest
|
| - : public WebRtcContentBrowserTestBase,
|
| - public testing::WithParamInterface<UserMediaSizes> {
|
| - public:
|
| - WebRtcConstraintsBrowserTest() : user_media_(GetParam()) {
|
| - // Automatically grant device permission.
|
| - AppendUseFakeUIForMediaStreamFlag();
|
| - }
|
| - const UserMediaSizes& user_media() const { return user_media_; }
|
| -
|
| - private:
|
| - UserMediaSizes user_media_;
|
| -};
|
| -
|
| -// Test fails under MSan, http://crbug.com/445745
|
| -#if defined(MEMORY_SANITIZER)
|
| -#define MAYBE_GetUserMediaConstraints DISABLED_GetUserMediaConstraints
|
| -#else
|
| -#define MAYBE_GetUserMediaConstraints GetUserMediaConstraints
|
| -#endif
|
| -// This test calls getUserMedia in sequence with different constraints.
|
| -IN_PROC_BROWSER_TEST_P(WebRtcConstraintsBrowserTest,
|
| - MAYBE_GetUserMediaConstraints) {
|
| - ASSERT_TRUE(embedded_test_server()->Start());
|
| -
|
| - GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
|
| -
|
| - std::string call = GenerateGetUserMediaCall(kGetUserMediaAndStop,
|
| - user_media().min_width,
|
| - user_media().max_width,
|
| - user_media().min_height,
|
| - user_media().max_height,
|
| - user_media().min_frame_rate,
|
| - user_media().max_frame_rate);
|
| - DVLOG(1) << "Calling getUserMedia: " << call;
|
| - NavigateToURL(shell(), url);
|
| - ExecuteJavascriptAndWaitForOk(call);
|
| -}
|
| -
|
| -static const UserMediaSizes kAllUserMediaSizes[] = {
|
| - {320, 320, 180, 180, 10, 30},
|
| - {320, 320, 240, 240, 10, 30},
|
| - {640, 640, 360, 360, 10, 30},
|
| - {640, 640, 480, 480, 10, 30},
|
| - {960, 960, 720, 720, 10, 30},
|
| - {1280, 1280, 720, 720, 10, 30}};
|
| -
|
| -INSTANTIATE_TEST_CASE_P(UserMedia,
|
| - WebRtcConstraintsBrowserTest,
|
| - testing::ValuesIn(kAllUserMediaSizes));
|
| -
|
| } // namespace content
|
|
|