Commit 0d38207c authored by wjia@chromium.org's avatar wjia@chromium.org

Remove unsupported WebRtc test on Android.

The test WebRtcGetUserMediaBrowserTest.TraceVideoCaptureDeviceAndroidPerformanceDuringGetUserMedia
is not supported since content_browsertests always use faked capture device.

BUG=181069
R=mcasas@chromium.org

Review URL: https://codereview.chromium.org/191713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255995 0039d316-1c4b-4281-b951-d872f2087c98
parent e03adc9c
...@@ -71,9 +71,6 @@ DownloadContentTest.ResumeInterruptedDownloadNoVerifiers ...@@ -71,9 +71,6 @@ DownloadContentTest.ResumeInterruptedDownloadNoVerifiers
DownloadContentTest.ResumeInterruptedDownloadBadPrecondition DownloadContentTest.ResumeInterruptedDownloadBadPrecondition
DownloadContentTest.ResumeWithDeletedFile DownloadContentTest.ResumeWithDeletedFile
# http://crbug.com/181069
WebRtcGetUserMediaBrowserTest.TraceVideoCaptureDeviceAndroidPerformanceDuringGetUserMedia
# http://crbug.com/224134 # http://crbug.com/224134
RenderWidgetHostBrowserTest.GetSnapshotFromRendererTest RenderWidgetHostBrowserTest.GetSnapshotFromRendererTest
......
...@@ -356,20 +356,6 @@ IN_PROC_BROWSER_TEST_F( ...@@ -356,20 +356,6 @@ IN_PROC_BROWSER_TEST_F(
"VideoCaptureController"); "VideoCaptureController");
} }
// This test will make a simple getUserMedia page, verify that video is playing
// in a simple local <video>, and for a couple of seconds, collect some
// performance traces. Only for Android.
#if defined(OS_ANDROID)
IN_PROC_BROWSER_TEST_F(
WebRtcGetUserMediaBrowserTest,
TraceVideoCaptureDeviceAndroidPerformanceDuringGetUserMedia) {
RunGetUserMediaAndCollectMeasures(
10,
"VideoCaptureDeviceAndroid::OnFrameAvailable",
"VideoCaptureDeviceAndroid");
}
#endif
// This test calls getUserMedia and checks for aspect ratio behavior. // This test calls getUserMedia and checks for aspect ratio behavior.
IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest, IN_PROC_BROWSER_TEST_F(WebRtcGetUserMediaBrowserTest,
TestGetUserMediaAspectRatio4To3) { TestGetUserMediaAspectRatio4To3) {
......
...@@ -9,7 +9,6 @@ ...@@ -9,7 +9,6 @@
#include "base/android/jni_android.h" #include "base/android/jni_android.h"
#include "base/android/jni_string.h" #include "base/android/jni_string.h"
#include "base/android/scoped_java_ref.h" #include "base/android/scoped_java_ref.h"
#include "base/debug/trace_event.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "jni/VideoCapture_jni.h" #include "jni/VideoCapture_jni.h"
...@@ -232,7 +231,6 @@ void VideoCaptureDeviceAndroid::OnFrameAvailable( ...@@ -232,7 +231,6 @@ void VideoCaptureDeviceAndroid::OnFrameAvailable(
jbyteArray data, jbyteArray data,
jint length, jint length,
jint rotation) { jint rotation) {
TRACE_EVENT0("video", "VideoCaptureDeviceAndroid::OnFrameAvailable");
DVLOG(3) << "VideoCaptureDeviceAndroid::OnFrameAvailable: length =" << length; DVLOG(3) << "VideoCaptureDeviceAndroid::OnFrameAvailable: length =" << length;
base::AutoLock lock(lock_); base::AutoLock lock(lock_);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment