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

Unified Diff: content/renderer/media/media_stream_impl_unittest.cc

Issue 10947030: Removed the use of WebFrame::frameForCurrentContext() in MediaStreamCenter::didStopLocalMediaStream (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressing code review comments found by Tommi. Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_impl_unittest.cc
diff --git a/content/renderer/media/media_stream_impl_unittest.cc b/content/renderer/media/media_stream_impl_unittest.cc
index d32bfa644968c7e1baebdf4aa661d21a4aaee012..a280e8c4c7756b7045e5447f434d1ad2555ee9f3 100644
--- a/content/renderer/media/media_stream_impl_unittest.cc
+++ b/content/renderer/media/media_stream_impl_unittest.cc
@@ -16,6 +16,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
class MediaStreamImplUnderTest : public MediaStreamImpl {
@@ -41,6 +42,8 @@ class MediaStreamImplUnderTest : public MediaStreamImpl {
return last_generated_stream_;
}
+ using MediaStreamImpl::OnLocalMediaStreamStop;
+
private:
WebKit::WebMediaStreamDescriptor last_generated_stream_;
};
@@ -124,9 +127,9 @@ TEST_F(MediaStreamImplTest, LocalMediaStream) {
EXPECT_TRUE(video_decoder.get() != NULL);
// Stop generated local streams.
- ms_impl_->StopLocalMediaStream(mixed_desc);
+ ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());
EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
- ms_impl_->StopLocalMediaStream(audio_desc);
+ ms_impl_->OnLocalMediaStreamStop(audio_desc.label().utf8());
EXPECT_EQ(2, ms_dispatcher_->stop_stream_counter());
// Test that the MediaStreams are deleted if the owning WebFrame is deleted.
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698