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

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

Issue 133903004: Cleaned up the WebRtcAudioCapturer a bit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed the comment. Created 6 years, 11 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 | « no previous file | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/json/json_reader.h" 6 #include "base/json/json_reader.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/test/trace_event_analyzer.h" 9 #include "base/test/trace_event_analyzer.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 260 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
261 261
262 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); 262 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
263 NavigateToURL(shell(), url); 263 NavigateToURL(shell(), url);
264 264
265 ASSERT_TRUE(ExecuteJavascript("getUserMediaAndClone();")); 265 ASSERT_TRUE(ExecuteJavascript("getUserMediaAndClone();"));
266 266
267 ExpectTitle("OK"); 267 ExpectTitle("OK");
268 } 268 }
269 269
270 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, TwoGetUserMediaAndStop) {
271 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
272
273 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
274 NavigateToURL(shell(), url);
275
276 ASSERT_TRUE(ExecuteJavascript(
277 "twoGetUserMediaAndStop({video: true, audio: true});"));
278
279 ExpectTitle("OK");
280 }
281
270 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetUserMediaWithMandatorySourceID_1) { 282 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, GetUserMediaWithMandatorySourceID_1) {
271 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 283 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
272 284
273 std::vector<std::string> audio_ids; 285 std::vector<std::string> audio_ids;
274 std::vector<std::string> video_ids; 286 std::vector<std::string> video_ids;
275 GetSources(&audio_ids, &video_ids); 287 GetSources(&audio_ids, &video_ids);
276 288
277 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html")); 289 GURL url(embedded_test_server()->GetURL("/media/getusermedia.html"));
278 NavigateToURL(shell(), url); 290 NavigateToURL(shell(), url);
279 291
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 EXPECT_TRUE(base::PathExists(dump_file)); 872 EXPECT_TRUE(base::PathExists(dump_file));
861 int64 file_size = 0; 873 int64 file_size = 0;
862 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size)); 874 EXPECT_TRUE(base::GetFileSize(dump_file, &file_size));
863 EXPECT_EQ(0, file_size); 875 EXPECT_EQ(0, file_size);
864 876
865 base::DeleteFile(dump_file, false); 877 base::DeleteFile(dump_file, false);
866 } 878 }
867 879
868 880
869 } // namespace content 881 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698