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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler_unittest.cc

Issue 12207107: Update libjingle 273:277. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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 <string> 5 #include <string>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "content/renderer/media/media_stream_extra_data.h" 10 #include "content/renderer/media/media_stream_extra_data.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 MOCK_METHOD2(TrackCreateAnswer, 136 MOCK_METHOD2(TrackCreateAnswer,
137 void(RTCPeerConnectionHandler* pc_handler, 137 void(RTCPeerConnectionHandler* pc_handler,
138 const RTCMediaConstraints& constraints)); 138 const RTCMediaConstraints& constraints));
139 MOCK_METHOD3(TrackSetSessionDescription, 139 MOCK_METHOD3(TrackSetSessionDescription,
140 void(RTCPeerConnectionHandler* pc_handler, 140 void(RTCPeerConnectionHandler* pc_handler,
141 const webrtc::SessionDescriptionInterface* desc, 141 const webrtc::SessionDescriptionInterface* desc,
142 Source source)); 142 Source source));
143 MOCK_METHOD3( 143 MOCK_METHOD3(
144 TrackUpdateIce, 144 TrackUpdateIce,
145 void(RTCPeerConnectionHandler* pc_handler, 145 void(RTCPeerConnectionHandler* pc_handler,
146 const std::vector<webrtc::JsepInterface::IceServer>& servers, 146 const std::vector<
147 webrtc::PeerConnectionInterface::IceServer>& servers,
147 const RTCMediaConstraints& options)); 148 const RTCMediaConstraints& options));
148 MOCK_METHOD3(TrackAddIceCandidate, 149 MOCK_METHOD3(TrackAddIceCandidate,
149 void(RTCPeerConnectionHandler* pc_handler, 150 void(RTCPeerConnectionHandler* pc_handler,
150 const WebKit::WebRTCICECandidate& candidate, 151 const WebKit::WebRTCICECandidate& candidate,
151 Source source)); 152 Source source));
152 MOCK_METHOD3(TrackAddStream, 153 MOCK_METHOD3(TrackAddStream,
153 void(RTCPeerConnectionHandler* pc_handler, 154 void(RTCPeerConnectionHandler* pc_handler,
154 const WebKit::WebMediaStream& stream, 155 const WebKit::WebMediaStream& stream,
155 Source source)); 156 Source source));
156 MOCK_METHOD3(TrackRemoveStream, 157 MOCK_METHOD3(TrackRemoveStream,
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
574 EXPECT_FALSE(pc_handler_->createDTMFSender(tracks[0])); 575 EXPECT_FALSE(pc_handler_->createDTMFSender(tracks[0]));
575 576
576 local_stream.audioSources(tracks); 577 local_stream.audioSources(tracks);
577 ASSERT_LE(1ul, tracks.size()); 578 ASSERT_LE(1ul, tracks.size());
578 scoped_ptr<WebKit::WebRTCDTMFSenderHandler> sender( 579 scoped_ptr<WebKit::WebRTCDTMFSenderHandler> sender(
579 pc_handler_->createDTMFSender(tracks[0])); 580 pc_handler_->createDTMFSender(tracks[0]));
580 EXPECT_TRUE(sender.get()); 581 EXPECT_TRUE(sender.get());
581 } 582 }
582 583
583 } // namespace content 584 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_peer_connection_handler.cc ('k') | content/test/data/media/peerconnection-call.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698