content/browser/media/webrtc_browsertest.cc - Issue 16408017: Use a direct include of utf_string_conversions.h in content/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: content/browser/media/webrtc_browsertest.cc

Issue 16408017: Use a direct include of utf_string_conversions.h in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « content/browser/media/media_browsertest.cc ('k') | content/browser/media/webrtc_internals_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

7 #include "content/browser/web_contents/web_contents_impl.h"	7 #include "content/browser/web_contents/web_contents_impl.h"

8 #include "content/public/common/content_switches.h"	8 #include "content/public/common/content_switches.h"

9 #include "content/public/test/browser_test_utils.h"	9 #include "content/public/test/browser_test_utils.h"

10 #include "content/shell/shell.h"	10 #include "content/shell/shell.h"

11 #include "content/test/content_browser_test.h"	11 #include "content/test/content_browser_test.h"

12 #include "content/test/content_browser_test_utils.h"	12 #include "content/test/content_browser_test_utils.h"

13 #include "net/test/embedded_test_server/embedded_test_server.h"	13 #include "net/test/embedded_test_server/embedded_test_server.h"

14	14

15 #if defined(OS_WIN)	15 #if defined(OS_WIN)

16 #include "base/win/windows_version.h"	16 #include "base/win/windows_version.h"

(...skipping 205 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
222 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {	222 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MANUAL_CallAndModifyStream) {

223 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));	223 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));

224 NavigateToURL(shell(), url);	224 NavigateToURL(shell(), url);

225	225

226 EXPECT_TRUE(	226 EXPECT_TRUE(

227 ExecuteJavascript("callWithNewVideoMediaStreamLaterSwitchToAudio();"));	227 ExecuteJavascript("callWithNewVideoMediaStreamLaterSwitchToAudio();"));

228 ExpectTitle("OK");	228 ExpectTitle("OK");

229 }	229 }

230	230

231 } // namespace content	231 } // namespace content

OLD	NEW