| OLD | NEW |
| 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 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 251 video_tracks[0] = MediaStreamVideoTrack::CreateVideoTrack( | 251 video_tracks[0] = MediaStreamVideoTrack::CreateVideoTrack( |
| 252 native_video_source, constraints, | 252 native_video_source, constraints, |
| 253 MediaStreamVideoSource::ConstraintsCallback(), true, | 253 MediaStreamVideoSource::ConstraintsCallback(), true, |
| 254 mock_dependency_factory_.get()); | 254 mock_dependency_factory_.get()); |
| 255 | 255 |
| 256 blink::WebMediaStream local_stream; | 256 blink::WebMediaStream local_stream; |
| 257 local_stream.initialize(base::UTF8ToUTF16(stream_label), audio_tracks, | 257 local_stream.initialize(base::UTF8ToUTF16(stream_label), audio_tracks, |
| 258 video_tracks); | 258 video_tracks); |
| 259 local_stream.setExtraData( | 259 local_stream.setExtraData( |
| 260 new MediaStream(mock_dependency_factory_.get(), | 260 new MediaStream(mock_dependency_factory_.get(), |
| 261 MediaStream::StreamStopCallback(), | |
| 262 local_stream)); | 261 local_stream)); |
| 263 return local_stream; | 262 return local_stream; |
| 264 } | 263 } |
| 265 | 264 |
| 266 // Creates a remote MediaStream and adds it to the mocked native | 265 // Creates a remote MediaStream and adds it to the mocked native |
| 267 // peer connection. | 266 // peer connection. |
| 268 scoped_refptr<webrtc::MediaStreamInterface> | 267 scoped_refptr<webrtc::MediaStreamInterface> |
| 269 AddRemoteMockMediaStream(const std::string& stream_label, | 268 AddRemoteMockMediaStream(const std::string& stream_label, |
| 270 const std::string& video_track_label, | 269 const std::string& video_track_label, |
| 271 const std::string& audio_track_label) { | 270 const std::string& audio_track_label) { |
| (...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 855 EXPECT_CALL(*mock_tracker_.get(), | 854 EXPECT_CALL(*mock_tracker_.get(), |
| 856 TrackCreateDTMFSender(pc_handler_.get(), | 855 TrackCreateDTMFSender(pc_handler_.get(), |
| 857 testing::Ref(tracks[0]))); | 856 testing::Ref(tracks[0]))); |
| 858 | 857 |
| 859 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( | 858 scoped_ptr<blink::WebRTCDTMFSenderHandler> sender( |
| 860 pc_handler_->createDTMFSender(tracks[0])); | 859 pc_handler_->createDTMFSender(tracks[0])); |
| 861 EXPECT_TRUE(sender.get()); | 860 EXPECT_TRUE(sender.get()); |
| 862 } | 861 } |
| 863 | 862 |
| 864 } // namespace content | 863 } // namespace content |
| OLD | NEW |