Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc b/src/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
index 398bc99..49e59a3 100644 (file)
--- a/src/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
+++ b/src/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
+#include "base/win/windows_version.h"
 #include "chrome/browser/media/webrtc_browsertest_base.h"
 #include "chrome/browser/media/webrtc_browsertest_common.h"
 #include "chrome/common/chrome_version_info.h"
@@ -31,7 +32,6 @@ class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase {
   virtual ~WebRtcDisableEncryptionFlagBrowserTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
     DetectErrorsInJavaScript();  // Look for errors in our rather complex js.
   }
 
@@ -43,25 +43,33 @@ class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase {
     command_line->AppendSwitch(switches::kDisableWebRtcEncryption);
   }
 
- protected:
-  PeerConnectionServerRunner peerconnection_server_;
-
  private:
   DISALLOW_COPY_AND_ASSIGN(WebRtcDisableEncryptionFlagBrowserTest);
 };
 
 // Makes a call and checks that there's encryption or not in the SDP offer.
+// TODO(phoglund): this is unreliable on non-webrtc bots because its peer
+// connection server could clash with other tests running in parallel,
+// therefore only running manually. http://crbug.com/358207.
 IN_PROC_BROWSER_TEST_F(WebRtcDisableEncryptionFlagBrowserTest,
-                       VerifyEncryption) {
+                       MANUAL_VerifyEncryption) {
+// Flaky timeout on a webrtc Win XP bot. http://crbug.com/368163.
+#if defined (OS_WIN)
+  if (base::win::GetVersion() < base::win::VERSION_VISTA)
+    return;
+#endif
+
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
-  ASSERT_TRUE(peerconnection_server_.Start());
 
   content::WebContents* left_tab =
       OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
   content::WebContents* right_tab =
       OpenTestPageAndGetUserMediaInNewTab(kMainWebrtcTestHtmlPage);
 
-  EstablishCall(left_tab, right_tab);
+  SetupPeerconnectionWithLocalStream(left_tab);
+  SetupPeerconnectionWithLocalStream(right_tab);
+
+  NegotiateCall(left_tab, right_tab);
 
   StartDetectingVideo(left_tab, "remote-view");
   StartDetectingVideo(right_tab, "remote-view");
@@ -88,8 +96,4 @@ IN_PROC_BROWSER_TEST_F(WebRtcDisableEncryptionFlagBrowserTest,
             ExecuteJavascript("hasSeenCryptoInSdp()", left_tab));
 
   HangUp(left_tab);
-  WaitUntilHangupVerified(left_tab);
-  WaitUntilHangupVerified(right_tab);
-
-  ASSERT_TRUE(peerconnection_server_.Stop());
 }