diff options
| -rw-r--r-- | build/android/pylib/gtest/filter/content_browsertests_disabled | 3 | ||||
| -rw-r--r-- | content/browser/media/webrtc_browsertest.cc | 15 |
2 files changed, 4 insertions, 14 deletions
diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled index c96ce6c..2978ce0 100644 --- a/build/android/pylib/gtest/filter/content_browsertests_disabled +++ b/build/android/pylib/gtest/filter/content_browsertests_disabled @@ -120,3 +120,6 @@ TracingControllerTest.EnableCaptureAndDisableMonitoringWithFilePath # http://crbug.com/343604 MSE_ClearKey/EncryptedMediaTest.ConfigChangeVideo/0 + +# http://crbug.com/362852 +WebRtcBrowserTests/WebRtcBrowserTest.* diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 2f81335..ce566ae 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -5,7 +5,6 @@ #include "base/command_line.h" #include "base/file_util.h" #include "base/strings/stringprintf.h" -#include "base/threading/platform_thread.h" #include "base/values.h" #include "content/browser/media/webrtc_internals.h" #include "content/browser/web_contents/web_contents_impl.h" @@ -46,18 +45,6 @@ class WebRtcBrowserTest : public WebRtcContentBrowserTest, command_line->AppendSwitch(switches::kEnableAudioTrackProcessing); } - virtual void TearDownOnMainThread() OVERRIDE { -#if defined(OS_ANDROID) - // TODO(phoglund): this is a ugly workaround to let the IO thread - // finish its work. The reason we need this on Android is that - // content_browsertests tearDown logic is broken with respect - // to threading, which causes the IO thread to compete with the - // teardown. See http://crbug.com/362852. I also tried with 2 - // seconds, but that isn't enough. - base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(5)); -#endif - } - // Convenience function since most peerconnection-call.html tests just load // the page, kick off some javascript and wait for the title to change to OK. void MakeTypicalPeerConnectionCall(const std::string& javascript) { @@ -71,7 +58,7 @@ class WebRtcBrowserTest : public WebRtcContentBrowserTest, } void DisableOpusIfOnAndroid() { -#if defined(OS_ANDROID) +#if defined (OS_ANDROID) // Always force iSAC 16K on Android for now (Opus is broken). EXPECT_EQ("isac-forced", ExecuteJavascriptAndReturnResult("forceIsac16KInSdp();")); |