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

Side by Side Diff: content/renderer/media/media_stream_impl_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 "base/utf_string_conversions.h" 6 #include "base/utf_string_conversions.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_impl.h" 8 #include "content/renderer/media/media_stream_impl.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_media_stream_dispatcher.h" 10 #include "content/renderer/media/mock_media_stream_dispatcher.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 ChangeVideoSourceStateToLive(); 88 ChangeVideoSourceStateToLive();
89 if (audio) 89 if (audio)
90 ChangeAudioSourceStateToLive(); 90 ChangeAudioSourceStateToLive();
91 91
92 EXPECT_EQ(MediaStreamImplUnderTest::REQUEST_SUCCEEDED, 92 EXPECT_EQ(MediaStreamImplUnderTest::REQUEST_SUCCEEDED,
93 ms_impl_->request_state()); 93 ms_impl_->request_state());
94 94
95 WebKit::WebMediaStream desc = ms_impl_->last_generated_stream(); 95 WebKit::WebMediaStream desc = ms_impl_->last_generated_stream();
96 content::MediaStreamExtraData* extra_data = 96 content::MediaStreamExtraData* extra_data =
97 static_cast<content::MediaStreamExtraData*>(desc.extraData()); 97 static_cast<content::MediaStreamExtraData*>(desc.extraData());
98 if (!extra_data || !extra_data->stream()) { 98 if (!extra_data || !extra_data->stream().get()) {
99 ADD_FAILURE(); 99 ADD_FAILURE();
100 return desc; 100 return desc;
101 } 101 }
102 102
103 if (audio) 103 if (audio)
104 EXPECT_EQ(1u, extra_data->stream()->GetAudioTracks().size()); 104 EXPECT_EQ(1u, extra_data->stream()->GetAudioTracks().size());
105 if (video) 105 if (video)
106 EXPECT_EQ(1u, extra_data->stream()->GetVideoTracks().size()); 106 EXPECT_EQ(1u, extra_data->stream()->GetVideoTracks().size());
107 if (audio && video) { 107 if (audio && video) {
108 EXPECT_NE(extra_data->stream()->GetAudioTracks()[0]->id(), 108 EXPECT_NE(extra_data->stream()->GetAudioTracks()[0]->id(),
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true); 230 WebKit::WebMediaStream mixed_desc = RequestLocalMediaStream(true, true);
231 EXPECT_EQ(0, ms_dispatcher_->stop_stream_counter()); 231 EXPECT_EQ(0, ms_dispatcher_->stop_stream_counter());
232 EXPECT_EQ(1, ms_dispatcher_->request_stream_counter()); 232 EXPECT_EQ(1, ms_dispatcher_->request_stream_counter());
233 ms_impl_->FrameWillClose(NULL); 233 ms_impl_->FrameWillClose(NULL);
234 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter()); 234 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
235 ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8()); 235 ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());
236 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter()); 236 EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
237 } 237 }
238 238
239 } // namespace content 239 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/media_stream_source_extra_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698