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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased 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"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 } 120 }
121 EXPECT_TRUE(observer.result()); 121 EXPECT_TRUE(observer.result());
122 EXPECT_TRUE(observer.description() == descriptor); 122 EXPECT_TRUE(observer.description() == descriptor);
123 } 123 }
124 124
125 void VerifyMediaStream(const WebKit::WebMediaStream& stream_desc, 125 void VerifyMediaStream(const WebKit::WebMediaStream& stream_desc,
126 size_t num_audio_tracks, 126 size_t num_audio_tracks,
127 size_t num_video_tracks) { 127 size_t num_video_tracks) {
128 content::MediaStreamExtraData* extra_data = 128 content::MediaStreamExtraData* extra_data =
129 static_cast<content::MediaStreamExtraData*>(stream_desc.extraData()); 129 static_cast<content::MediaStreamExtraData*>(stream_desc.extraData());
130 ASSERT_TRUE(extra_data && extra_data->stream()); 130 ASSERT_TRUE(extra_data && extra_data->stream().get());
131 EXPECT_TRUE(extra_data->is_local()); 131 EXPECT_TRUE(extra_data->is_local());
132 EXPECT_EQ(num_audio_tracks, extra_data->stream()->GetAudioTracks().size()); 132 EXPECT_EQ(num_audio_tracks, extra_data->stream()->GetAudioTracks().size());
133 EXPECT_EQ(num_video_tracks, extra_data->stream()->GetVideoTracks().size()); 133 EXPECT_EQ(num_video_tracks, extra_data->stream()->GetVideoTracks().size());
134 } 134 }
135 135
136 protected: 136 protected:
137 scoped_ptr<MockMediaStreamDependencyFactory> dependency_factory_; 137 scoped_ptr<MockMediaStreamDependencyFactory> dependency_factory_;
138 WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources_; 138 WebKit::WebVector<WebKit::WebMediaStreamSource> audio_sources_;
139 WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources_; 139 WebKit::WebVector<WebKit::WebMediaStreamSource> video_sources_;
140 }; 140 };
(...skipping 58 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_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698