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

Side by Side Diff: chrome/browser/media/webrtc/webrtc_browsertest_base.cc

Issue 2951713002: RTCPeerConnection.addTrack and removeTrack added (behind flag) (Closed)
Patch Set: Addressed guidou's comments Created 3 years, 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/media/webrtc/webrtc_browsertest_base.h" 5 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <limits> 9 #include <limits>
10 10
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/string_split.h"
16 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 18 #include "base/strings/stringprintf.h"
18 #include "base/values.h" 19 #include "base/values.h"
19 #include "build/build_config.h" 20 #include "build/build_config.h"
20 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h" 21 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h"
21 #include "chrome/browser/permissions/permission_request_manager.h" 22 #include "chrome/browser/permissions/permission_request_manager.h"
22 #include "chrome/browser/ui/browser.h" 23 #include "chrome/browser/ui/browser.h"
23 #include "chrome/browser/ui/browser_tabstrip.h" 24 #include "chrome/browser/ui/browser_tabstrip.h"
24 #include "chrome/browser/ui/tabs/tab_strip_model.h" 25 #include "chrome/browser/ui/tabs/tab_strip_model.h"
25 #include "chrome/test/base/ui_test_utils.h" 26 #include "chrome/test/base/ui_test_utils.h"
(...skipping 562 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 589
589 void WebRtcTestBase::VerifyRtpReceivers( 590 void WebRtcTestBase::VerifyRtpReceivers(
590 content::WebContents* tab, 591 content::WebContents* tab,
591 base::Optional<size_t> expected_num_tracks) const { 592 base::Optional<size_t> expected_num_tracks) const {
592 std::string javascript = 593 std::string javascript =
593 expected_num_tracks ? "verifyRtpReceivers(" + 594 expected_num_tracks ? "verifyRtpReceivers(" +
594 base::SizeTToString(*expected_num_tracks) + ")" 595 base::SizeTToString(*expected_num_tracks) + ")"
595 : "verifyRtpReceivers()"; 596 : "verifyRtpReceivers()";
596 EXPECT_EQ("ok-receivers-verified", ExecuteJavascript(javascript, tab)); 597 EXPECT_EQ("ok-receivers-verified", ExecuteJavascript(javascript, tab));
597 } 598 }
599
600 std::vector<std::string> WebRtcTestBase::CreateAndAddAudioAndVideoTrack(
601 content::WebContents* tab,
602 StreamArgumentType stream_argument_type) const {
603 const char* string_argument_type_str = nullptr;
604 switch (stream_argument_type) {
605 case StreamArgumentType::NO_STREAM:
606 string_argument_type_str = "'no-stream'";
607 break;
608 case StreamArgumentType::SHARED_STREAM:
609 string_argument_type_str = "'shared-stream'";
610 break;
611 case StreamArgumentType::INDIVIDUAL_STREAMS:
612 string_argument_type_str = "'individual-streams'";
613 break;
614 }
615 std::string result =
616 ExecuteJavascript(base::StringPrintf("createAndAddAudioAndVideoTrack(%s)",
617 string_argument_type_str),
618 tab);
619 EXPECT_TRUE(base::StartsWith(result, "ok-", base::CompareCase::SENSITIVE));
620 std::vector<std::string> ids = base::SplitString(
621 result.substr(3), " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
622 EXPECT_EQ(4u, ids.size());
623 return ids;
624 }
625
626 void WebRtcTestBase::RemoveTrack(content::WebContents* tab,
627 const std::string& track_id) const {
628 EXPECT_EQ(
629 "ok-sender-removed",
630 ExecuteJavascript(
631 base::StringPrintf("removeTrack('%s')", track_id.c_str()), tab));
632 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698