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

Side by Side Diff: content/browser/webrtc/webrtc_capture_from_element_browsertest.cc

Issue 2362553002: Disable WebRtcCaptureFromElementBrowserTest.MAYBE_CaptureFromMediaElement in devices pre-Marshmallow (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" 7 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 #include "media/base/test_data_util.h" 9 #include "media/base/test_data_util.h"
10 10
11 #if defined(OS_ANDROID)
12 #include "base/android/build_info.h"
13 #include "base/sys_info.h"
14 #endif
15
11 #if defined(ENABLE_MOJO_RENDERER) 16 #if defined(ENABLE_MOJO_RENDERER)
12 // Remote mojo renderer does not send audio/video frames back to the renderer 17 // Remote mojo renderer does not send audio/video frames back to the renderer
13 // process and hence does not support capture: https://crbug.com/641559. 18 // process and hence does not support capture: https://crbug.com/641559.
14 #define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement 19 #define MAYBE_CaptureFromMediaElement DISABLED_CaptureFromMediaElement
15 #else 20 #else
16 #define MAYBE_CaptureFromMediaElement CaptureFromMediaElement 21 #define MAYBE_CaptureFromMediaElement CaptureFromMediaElement
17 #endif 22 #endif
18 23
19 namespace { 24 namespace {
20 25
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest); 68 DISALLOW_COPY_AND_ASSIGN(WebRtcCaptureFromElementBrowserTest);
64 }; 69 };
65 70
66 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest, 71 IN_PROC_BROWSER_TEST_F(WebRtcCaptureFromElementBrowserTest,
67 VerifyCanvasCaptureColor) { 72 VerifyCanvasCaptureColor) {
68 MakeTypicalCall("testCanvasCaptureColors();", kCanvasTestHtmlPage); 73 MakeTypicalCall("testCanvasCaptureColors();", kCanvasTestHtmlPage);
69 } 74 }
70 75
71 IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest, 76 IN_PROC_BROWSER_TEST_P(WebRtcCaptureFromElementBrowserTest,
72 MAYBE_CaptureFromMediaElement) { 77 MAYBE_CaptureFromMediaElement) {
78 #if defined(OS_ANDROID)
79 // TODO(mcasas): flaky on Lollipop Low-End devices, investigate and reconnect
80 // https://crbug.com/626299
81 if (base::SysInfo::IsLowEndDevice() &&
82 base::android::BuildInfo::GetInstance()->sdk_int() <
83 base::android::SDK_VERSION_MARSHMALLOW) {
84 return;
85 }
86 #endif
87
73 MakeTypicalCall( 88 MakeTypicalCall(
74 base::StringPrintf("testCaptureFromMediaElement(\"%s\", %d, %d, %d);", 89 base::StringPrintf("testCaptureFromMediaElement(\"%s\", %d, %d, %d);",
75 GetParam().filename.c_str(), 90 GetParam().filename.c_str(),
76 GetParam().has_video, 91 GetParam().has_video,
77 GetParam().has_audio, 92 GetParam().has_audio,
78 GetParam().use_audio_tag), 93 GetParam().use_audio_tag),
79 kVideoAudioHtmlFile); 94 kVideoAudioHtmlFile);
80 } 95 }
81 96
82 INSTANTIATE_TEST_CASE_P(, 97 INSTANTIATE_TEST_CASE_P(,
83 WebRtcCaptureFromElementBrowserTest, 98 WebRtcCaptureFromElementBrowserTest,
84 testing::ValuesIn(kFileAndTypeParameters)); 99 testing::ValuesIn(kFileAndTypeParameters));
85 } // namespace content 100 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698