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

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

Issue 15822010: Update refernces to Blink's Platform API (content) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 "base/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "content/common/media/media_stream_options.h" 6 #include "content/common/media/media_stream_options.h"
7 #include "content/renderer/media/media_stream_extra_data.h" 7 #include "content/renderer/media/media_stream_extra_data.h"
8 #include "content/renderer/media/media_stream_source_extra_data.h" 8 #include "content/renderer/media/media_stream_source_extra_data.h"
9 #include "content/renderer/media/mock_media_stream_dependency_factory.h" 9 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
10 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h" 10 #include "content/renderer/media/mock_web_rtc_peer_connection_handler_client.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints .h" 12 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
13 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h" 13 #include "third_party/WebKit/public/platform/WebMediaStream.h"
14 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamSourc e.h" 14 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack .h" 15 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
16 #include "third_party/WebKit/Source/Platform/chromium/public/WebRTCPeerConnectio nHandler.h" 16 #include "third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h"
17 #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h" 17 #include "third_party/WebKit/public/platform/WebVector.h"
18 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h" 18 #include "third_party/libjingle/source/talk/app/webrtc/videosourceinterface.h"
19 19
20 namespace content { 20 namespace content {
21 21
22 class MediaSourceCreatedObserver { 22 class MediaSourceCreatedObserver {
23 public: 23 public:
24 MediaSourceCreatedObserver() 24 MediaSourceCreatedObserver()
25 : result_(false), 25 : result_(false),
26 description_(NULL) { 26 description_(NULL) {
27 } 27 }
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack( 199 EXPECT_TRUE(dependency_factory_->RemoveNativeMediaStreamTrack(
200 stream_desc, video_tracks[0])); 200 stream_desc, video_tracks[0]));
201 VerifyMediaStream(stream_desc, 1, 0); 201 VerifyMediaStream(stream_desc, 1, 0);
202 202
203 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack( 203 EXPECT_TRUE(dependency_factory_->AddNativeMediaStreamTrack(
204 stream_desc, video_tracks[0])); 204 stream_desc, video_tracks[0]));
205 VerifyMediaStream(stream_desc, 1, 1); 205 VerifyMediaStream(stream_desc, 1, 1);
206 } 206 }
207 207
208 } // namespace content 208 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dependency_factory.cc ('k') | content/renderer/media/media_stream_extra_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698