Check media permissions through RenderFrameHostDelegate.

content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc

Index: content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index 5f4b7e9674a92dd4894029fa8c3128d76a988e52..0562dcf86e63a0b7bd66f3198c60f691301cb34c 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -230,6 +230,7 @@ class MediaStreamManagerForTest : public MediaStreamManager {
   }
 
  private:
+  /*

[perkj_chrome, 2014/09/15 12:06:25]

fix

[Henrik Grunell, 2014/09/15 13:45:17]

Oh right, forgot to say that this test isn't done yet. Sorry. Will update it
later today.

   virtual bool CheckMediaAccessPermissionOnUIThread(
       int render_process_id,
       const GURL& security_origin,
@@ -240,6 +241,7 @@ class MediaStreamManagerForTest : public MediaStreamManager {
       return camera_access_;
     return false;
   }
+  */
 
   bool mic_access_;
   bool camera_access_;
@@ -298,12 +300,14 @@ class MediaStreamDispatcherHostTest : public testing::Test {
 
  protected:
   virtual void SetupFakeUI(bool expect_started) {
-    scoped_ptr<MockMediaStreamUIProxy> stream_ui(new MockMediaStreamUIProxy());
+    stream_ui_ = new MockMediaStreamUIProxy();
+    scoped_ptr<MockMediaStreamUIProxy> stream_ui(stream_ui_);
     if (expect_started) {
-      EXPECT_CALL(*stream_ui, OnStarted(_, _));
+      EXPECT_CALL(*stream_ui_, OnStarted(_, _));
     }
     media_stream_manager_->UseFakeUI(
-        stream_ui.PassAs<FakeMediaStreamUIProxy>());
+//        static_cast<FakeMediaStreamUIProxy*>(stream_ui_));

[perkj_chrome, 2014/09/15 12:06:25]

fix

[Henrik Grunell, 2014/09/15 13:45:17]

Same here.

+    stream_ui.PassAs<FakeMediaStreamUIProxy>());
   }
 
   void GenerateStreamAndWaitForResult(int render_frame_id,
@@ -447,6 +451,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {
   scoped_refptr<MockMediaStreamDispatcherHost> host_;
   scoped_ptr<media::AudioManager> audio_manager_;
   scoped_ptr<MediaStreamManagerForTest> media_stream_manager_;
+  MockMediaStreamUIProxy* stream_ui_;
   ContentBrowserClient* old_browser_client_;
   scoped_ptr<ContentClient> content_client_;
   content::TestBrowserThreadBundle thread_bundle_;
@@ -924,6 +929,7 @@ TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevices) {
 
 TEST_F(MediaStreamDispatcherHostTest, EnumerateAudioDevicesNoAccess) {
   media_stream_manager_->set_mic_access(false);
+  stream_ui_->SetMicAccess(true);
   EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId,
                                    MEDIA_DEVICE_AUDIO_CAPTURE);
   EXPECT_TRUE(DoesNotContainLabels(host_->enumerated_devices_));
@@ -931,6 +937,7 @@ TEST_F(MediaStreamDispatcherHostTest, EnumerateAudioDevicesNoAccess) {
 
 TEST_F(MediaStreamDispatcherHostTest, EnumerateVideoDevicesNoAccess) {
   media_stream_manager_->set_camera_access(false);
+  stream_ui_->SetCameraAccess(true);
   EnumerateDevicesAndWaitForResult(kRenderId, kPageRequestId,
                                    MEDIA_DEVICE_VIDEO_CAPTURE);
   EXPECT_TRUE(DoesNotContainLabels(host_->enumerated_devices_));