Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

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

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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
OLDNEW
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/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/public/common/content_switches.h" 9 #include "content/public/common/content_switches.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
11 #include "content/shell/shell.h" 11 #include "content/shell/browser/shell.h"
12 #include "content/test/content_browser_test.h" 12 #include "content/test/content_browser_test.h"
13 #include "content/test/content_browser_test_utils.h" 13 #include "content/test/content_browser_test_utils.h"
14 #include "net/test/embedded_test_server/embedded_test_server.h" 14 #include "net/test/embedded_test_server/embedded_test_server.h"
15 15
16 #if defined(OS_WIN) 16 #if defined(OS_WIN)
17 #include "base/win/windows_version.h" 17 #include "base/win/windows_version.h"
18 #endif 18 #endif
19 19
20 namespace { 20 namespace {
21 21
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) { 292 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) {
293 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); 293 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html"));
294 NavigateToURL(shell(), url); 294 NavigateToURL(shell(), url);
295 295
296 EXPECT_TRUE( 296 EXPECT_TRUE(
297 ExecuteJavascript("addTwoMediaStreamsToOneConnection();")); 297 ExecuteJavascript("addTwoMediaStreamsToOneConnection();"));
298 ExpectTitle("OK"); 298 ExpectTitle("OK");
299 } 299 }
300 300
301 } // namespace content 301 } // namespace content
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698