Disable CanSetupAudioAndVideoCallWithoutMsidAndBundle.

content/browser/media/webrtc_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/shell/shell.h"
@@ skipping 97 matching lines @@
       "makeEmptyCallThenAddOneStreamAndRenegotiate("
       "{video: true, audio: true});";
   EXPECT_TRUE(ExecuteJavascript(kJavascript));
   ExpectTitle("OK");
 }
 
 // This test will make a complete PeerConnection-based call but remove the
 // MSID and bundle attribute from the initial offer to verify that
 // video is playing for the call even if the initiating client don't support
 // MSID. http://tools.ietf.org/html/draft-alvestrand-rtcweb-msid-02
+// Disabled, see http://crbug.com/235089.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest,
-                       CanSetupAudioAndVideoCallWithoutMsidAndBundle) {
+                       DISABLED_CanSetupAudioAndVideoCallWithoutMsidAndBundle) {

[gab, 2013/04/24 17:55:04]

Only needs to be disable on Win7Aura AFAIK.
i.e. Put

#if defined(OS_WIN) && defined(USE_AURA)
#define MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle
CanSetupAudioAndVideoCallWithoutMsidAndBundle
#else
#define DISABLED_CanSetupAudioAndVideoCallWithoutMsidAndBundle
#endif

above, and use MAYBE_CanSetupAudioAndVideoCallWithoutMsidAndBundle here.

[not at google - send to devlin, 2013/04/24 17:58:11]

Done.

   GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(ExecuteJavascript("callWithoutMsidAndBundle();"));
   ExpectTitle("OK");
 }
 
 // This test will make a PeerConnection-based call and test an unreliable text
 // dataChannel.
 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) {
@@ skipping 47 matching lines @@
   GURL url(test_server()->GetURL("files/media/peerconnection-call.html"));
   NavigateToURL(shell(), url);
 
   EXPECT_TRUE(
       ExecuteJavascript("callWithNewVideoMediaStreamLaterSwitchToAudio();"));
   ExpectTitle("OK");
 }
 
 }  // namespace content