Refactored how WebRTC content browser tests talk to their javascript.

content/test/webrtc_content_browsertest_base.cc

Index: content/test/webrtc_content_browsertest_base.cc
diff --git a/content/test/webrtc_content_browsertest_base.cc b/content/test/webrtc_content_browsertest_base.cc
index 54bafbeb74dda8b478e233f1073a0a8c21c8376e..5242aae3b0e861251b5b5aafc55e859684e4c314 100644
--- a/content/test/webrtc_content_browsertest_base.cc
+++ b/content/test/webrtc_content_browsertest_base.cc
@@ -33,11 +33,6 @@ void WebRtcContentBrowserTest::SetUp() {
   ContentBrowserTest::SetUp();
 }
 
-bool WebRtcContentBrowserTest::ExecuteJavascript(
-    const std::string& javascript) {
-  return ExecuteScript(shell()->web_contents(), javascript);
-}
-
 // Executes |javascript|. The script is required to use
 // window.domAutomationController.send to send a string value back to here.
 std::string WebRtcContentBrowserTest::ExecuteJavascriptAndReturnResult(
@@ -49,12 +44,19 @@ std::string WebRtcContentBrowserTest::ExecuteJavascriptAndReturnResult(
   return result;
 }
 
-void WebRtcContentBrowserTest::ExpectTitle(
-    const std::string& expected_title) const {
-  base::string16 expected_title16(base::ASCIIToUTF16(expected_title));
-  TitleWatcher title_watcher(shell()->web_contents(), expected_title16);
-  EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
-}
+void WebRtcContentBrowserTest::ExecuteJavascriptAndWaitForOk(
+    const std::string& javascript) {
+#if defined (OS_ANDROID)
+   // Always force iSAC 16K on Android for now (Opus is broken).
+   ASSERT_TRUE(ExecuteJavascript("forceIsac16KInSdp();"));

[perkj_chrome, 2014/03/07 14:00:21]

Does this work for all tests regardless of the test design?

[phoglund_chromium, 2014/03/07 14:23:36]

You're right, this will break android for the getusermedia.html tests actually.
I'll move this back to the peerconnection.html tests only.

+#endif
+
+   std::string result = ExecuteJavascriptAndReturnResult(javascript);
+   if (result != "OK") {
+     printf("From javascript: %s", result.c_str());
+     FAIL();
+   }
+ }
 
 std::string WebRtcContentBrowserTest::GenerateGetUserMediaCall(
     const char* function_name,