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

content/renderer/media/media_stream_impl_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_media_stream_dispatcher.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 #include "media/base/video_decoder.h"
 #include "media/base/message_loop_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #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 {
  public:
   MediaStreamImplUnderTest(MediaStreamDispatcher* media_stream_dispatcher,
                            VideoCaptureImplManager* vc_manager,
                            MediaStreamDependencyFactory* dependency_factory)
       : MediaStreamImpl(NULL, media_stream_dispatcher, vc_manager,
                         dependency_factory) {
   }
 
   virtual void CompleteGetUserMediaRequest(
        const WebKit::WebMediaStreamDescriptor& stream,
        WebKit::WebUserMediaRequest* request) {
     last_generated_stream_ = stream;
   }
 
   virtual WebKit::WebMediaStreamDescriptor GetMediaStream(const GURL& url) {
     return last_generated_stream_;
   }
 
   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_;
 };
 
 class MediaStreamImplTest : public ::testing::Test {
  public:
   void SetUp() {
     // Create our test object.
     ms_dispatcher_.reset(new MockMediaStreamDispatcher());
@@ skipping 64 matching lines @@
   EXPECT_TRUE(audio_decoder.get() == NULL);
 
   // Test a stream with video only.
   WebKit::WebMediaStreamDescriptor video_desc = RequestLocalMediaStream(false,
                                                                         true);
   scoped_refptr<media::VideoDecoder> video_decoder(
       ms_impl_->GetVideoDecoder(GURL(), message_loop_factory.get()));
   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.
   // In the unit test the owning frame is NULL.
   ms_impl_->FrameWillClose(NULL);
   EXPECT_EQ(3, ms_dispatcher_->stop_stream_counter());
 }