Roll WebRTC 5523:5548.

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/strings/stringprintf.h"
 #include "base/values.h"
 #include "content/browser/media/webrtc_internals.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/common/content_switches.h"
@@ skipping 81 matching lines @@
 // Flaky on win xp. http://crbug.com/304775
 #if defined(OS_WIN)
 #define MAYBE_CanForwardRemoteStream DISABLED_CanForwardRemoteStream
 #define MAYBE_CanForwardRemoteStream720p DISABLED_CanForwardRemoteStream720p
 #else
 #define MAYBE_CanForwardRemoteStream CanForwardRemoteStream
 #define MAYBE_CanForwardRemoteStream720p CanForwardRemoteStream720p
 #endif
 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanForwardRemoteStream) {
   MakeTypicalPeerConnectionCall(
-      "callAndForwardRemoteStream({video: true, audio: true});");
+      "callAndForwardRemoteStream({video: true, audio: false});");

[tommi (sloooow) - chröme, 2014/02/14 15:33:14]

why this change?

[Ronghua Wu (Left Chromium), 2014/02/14 16:37:00]

I'd like to know as well. Looks like you are working on remote audio forwarding?

[tommi (sloooow) - chröme, 2014/02/14 17:05:23]

Shijing explained this to me offline. The reason is that audio tracks will now
have a valid source object, whereas they didn't before.  This has the effect
that this test tries to forward remote audio tracks, which still isn't
supported.

 }
 
 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanForwardRemoteStream720p) {
   const std::string javascript = GenerateGetUserMediaCall(
       "callAndForwardRemoteStream", 1280, 1280, 720, 720, 30, 30);
   MakeTypicalPeerConnectionCall(javascript);
 }
 
 // This test will make a complete PeerConnection-based call but remove the
 // MSID and bundle attribute from the initial offer to verify that
@@ skipping 258 matching lines @@
 
   EXPECT_TRUE(base::PathExists(dump_file));
   int64 file_size = 0;
   EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
   EXPECT_EQ(0, file_size);
 
   base::DeleteFile(dump_file, false);
 }
 
 }  // namespace content