Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media / chrome_webrtc_browsertest.cc

diff --git a/src/chrome/browser/media/chrome_webrtc_browsertest.cc b/src/chrome/browser/media/chrome_webrtc_browsertest.cc
index 3dc9fcd..b3a9c8e 100644 (file)
--- a/src/chrome/browser/media/chrome_webrtc_browsertest.cc
+++ b/src/chrome/browser/media/chrome_webrtc_browsertest.cc
@@ -53,6 +53,12 @@ class WebRtcBrowserTest : public WebRtcTestBase {
     EXPECT_FALSE(command_line->HasSwitch(
         switches::kUseFakeUIForMediaStream));
 
+#if defined(OS_MACOSX)
+    // TODO(mcasas): Remove this switch when ManyCam virtual video capture
+    // device starts supporting AVFoundation, see http://crbug.com/327618.
+    command_line->AppendSwitch(switches::kDisableAVFoundation);
+#endif
+
     // Flag used by TestWebAudioMediaStream to force garbage collection.
     command_line->AppendSwitchASCII(switches::kJavaScriptFlags, "--expose-gc");
   }
@@ -76,19 +82,6 @@ class WebRtcBrowserTest : public WebRtcTestBase {
                                  "active", to_tab));
   }
 
-  void StartDetectingVideo(content::WebContents* tab_contents,
-                           const std::string& video_element) {
-    std::string javascript = base::StringPrintf(
-        "startDetection('%s', 'frame-buffer', 320, 240)",
-        video_element.c_str());
-    EXPECT_EQ("ok-started", ExecuteJavascript(javascript, tab_contents));
-  }
-
-  void WaitForVideoToPlay(content::WebContents* tab_contents) {
-    EXPECT_TRUE(PollingWaitUntil("isVideoPlaying()", "video-playing",
-                                 tab_contents));
-  }
-
   void HangUp(content::WebContents* from_tab) {
     EXPECT_EQ("ok-call-hung-up", ExecuteJavascript("hangUp()", from_tab));
   }