Removed the use of WebFrame::frameForCurrentContext() in MediaStreamCenter::didStopLocalMediaStream

content/renderer/media/media_stream_impl_unittest.cc

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..0abbb2ab15936fa045a800d196287a0999baabef 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 {
@@ -40,6 +41,7 @@ class MediaStreamImplUnderTest : public MediaStreamImpl {
   const WebKit::WebMediaStreamDescriptor& last_generated_stream() {
     return last_generated_stream_;
   }
+  using MediaStreamImpl::OnLocalMediaStreamStop;

[tommi (sloooow) - chröme, 2012/09/21 09:18:03]

empty line above.

Is this really needed though?  This class inherits from MediaStreamImpl, right? 
(I'm sure there's something I'm missing here)

[perkj_chrome, 2012/09/21 10:47:10]

Yes- unless I change OnLocalMediaStream to be public. 
On 2012/09/21 09:18:03, tommi wrote:

[tommi (sloooow) - chröme, 2012/09/21 11:23:53]

Ah, it's not public in the parent class then.  OK, can you add a comment that
explains why this is here then?

 
  private:
   WebKit::WebMediaStreamDescriptor last_generated_stream_;
@@ -124,9 +126,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.