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

Unified Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 435823002: Revert "Update webrtc&libjingle 6774:6799." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_peer_connection_handler_unittest.cc
diff --git a/content/renderer/media/rtc_peer_connection_handler_unittest.cc b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
index 2bd05e7cf6cf3d8335161c56c05ecf1107e14e1e..a71c4340c03442b3aad52f89902c74f5be26a054 100644
--- a/content/renderer/media/rtc_peer_connection_handler_unittest.cc
+++ b/content/renderer/media/rtc_peer_connection_handler_unittest.cc
@@ -93,7 +93,7 @@ class MockRTCStatsRequest : public LocalRTCStatsRequest {
}
virtual scoped_refptr<LocalRTCStatsResponse> createResponse() OVERRIDE {
DCHECK(!response_.get());
- response_ = new rtc::RefCountedObject<MockRTCStatsResponse>();
+ response_ = new talk_base::RefCountedObject<MockRTCStatsResponse>();
return response_;
}
@@ -459,7 +459,7 @@ TEST_F(RTCPeerConnectionHandlerTest, addStreamWithStoppedAudioAndVideoTrack) {
TEST_F(RTCPeerConnectionHandlerTest, GetStatsNoSelector) {
scoped_refptr<MockRTCStatsRequest> request(
- new rtc::RefCountedObject<MockRTCStatsRequest>());
+ new talk_base::RefCountedObject<MockRTCStatsRequest>());
pc_handler_->getStats(request.get());
// Note that callback gets executed synchronously by mock.
ASSERT_TRUE(request->result());
@@ -468,7 +468,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsNoSelector) {
TEST_F(RTCPeerConnectionHandlerTest, GetStatsAfterClose) {
scoped_refptr<MockRTCStatsRequest> request(
- new rtc::RefCountedObject<MockRTCStatsRequest>());
+ new talk_base::RefCountedObject<MockRTCStatsRequest>());
pc_handler_->stop();
pc_handler_->getStats(request.get());
// Note that callback gets executed synchronously by mock.
@@ -486,7 +486,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithLocalSelector) {
ASSERT_LE(1ul, tracks.size());
scoped_refptr<MockRTCStatsRequest> request(
- new rtc::RefCountedObject<MockRTCStatsRequest>());
+ new talk_base::RefCountedObject<MockRTCStatsRequest>());
request->setSelector(tracks[0]);
pc_handler_->getStats(request.get());
EXPECT_EQ(1, request->result()->report_count());
@@ -503,7 +503,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithRemoteSelector) {
ASSERT_LE(1ul, tracks.size());
scoped_refptr<MockRTCStatsRequest> request(
- new rtc::RefCountedObject<MockRTCStatsRequest>());
+ new talk_base::RefCountedObject<MockRTCStatsRequest>());
request->setSelector(tracks[0]);
pc_handler_->getStats(request.get());
EXPECT_EQ(1, request->result()->report_count());
@@ -522,7 +522,7 @@ TEST_F(RTCPeerConnectionHandlerTest, GetStatsWithBadSelector) {
mock_peer_connection_->SetGetStatsResult(false);
scoped_refptr<MockRTCStatsRequest> request(
- new rtc::RefCountedObject<MockRTCStatsRequest>());
+ new talk_base::RefCountedObject<MockRTCStatsRequest>());
request->setSelector(component);
pc_handler_->getStats(request.get());
EXPECT_EQ(0, request->result()->report_count());

Powered by Google App Engine
This is Rietveld 408576698