Do not pass the origin to MediaDevicesDispatcherHost.

content/renderer/media/media_devices_event_dispatcher_unittest.cc

Index: content/renderer/media/media_devices_event_dispatcher_unittest.cc
diff --git a/content/renderer/media/media_devices_event_dispatcher_unittest.cc b/content/renderer/media/media_devices_event_dispatcher_unittest.cc
index b1ee1c3324430ba9ab8cfa160cce1d969195b33d..78b6db8930171d41622a5f4ed606372685446141 100644
--- a/content/renderer/media/media_devices_event_dispatcher_unittest.cc
+++ b/content/renderer/media/media_devices_event_dispatcher_unittest.cc
@@ -35,23 +35,19 @@ class MockMediaDevicesDispatcherHost
  public:
   MockMediaDevicesDispatcherHost() : binding_(this) {}
 
-  MOCK_METHOD3(SubscribeDeviceChangeNotifications,
-               void(MediaDeviceType type,
-                    uint32_t subscription_id,
-                    const url::Origin& security_origin));
+  MOCK_METHOD2(SubscribeDeviceChangeNotifications,
+               void(MediaDeviceType type, uint32_t subscription_id));
   MOCK_METHOD2(UnsubscribeDeviceChangeNotifications,
                void(MediaDeviceType type, uint32_t subscription_id));
 
   void EnumerateDevices(bool request_audio_input,
                         bool request_video_input,
                         bool request_audio_output,
-                        const url::Origin& security_origin,
                         EnumerateDevicesCallback) override {
     NOTREACHED();
   }
 
   void GetVideoInputCapabilities(
-      const url::Origin& security_origin,
       GetVideoInputCapabilitiesCallback client_callback) override {
     NOTREACHED();
   }
@@ -90,20 +86,17 @@ TEST_F(MediaDevicesEventDispatcherTest, SubscribeUnsubscribeSingleType) {
     MediaDeviceType type = static_cast<MediaDeviceType>(i);
     MediaDeviceInfoArray device_infos;
     MockMediaDevicesEventSubscriber subscriber1, subscriber2;
-    url::Origin security_origin(GURL("http://localhost"));
     EXPECT_CALL(media_devices_dispatcher_,
-                SubscribeDeviceChangeNotifications(type, _, security_origin))
+                SubscribeDeviceChangeNotifications(type, _))
         .Times(2);
     auto subscription_id1 =
         event_dispatcher_->SubscribeDeviceChangeNotifications(
-            type, security_origin,
-            base::Bind(&MockMediaDevicesEventSubscriber::EventDispatched,
-                       base::Unretained(&subscriber1)));
+            type, base::Bind(&MockMediaDevicesEventSubscriber::EventDispatched,
+                             base::Unretained(&subscriber1)));
     auto subscription_id2 =
         event_dispatcher_->SubscribeDeviceChangeNotifications(
-            type, security_origin,
-            base::Bind(&MockMediaDevicesEventSubscriber::EventDispatched,
-                       base::Unretained(&subscriber2)));
+            type, base::Bind(&MockMediaDevicesEventSubscriber::EventDispatched,
+                             base::Unretained(&subscriber2)));
 
     // Simulate a device change.
     EXPECT_CALL(subscriber1, EventDispatched(type, _));
@@ -135,27 +128,21 @@ TEST_F(MediaDevicesEventDispatcherTest, SubscribeUnsubscribeSingleType) {
 TEST_F(MediaDevicesEventDispatcherTest, SubscribeUnsubscribeAllTypes) {
   MediaDeviceInfoArray device_infos;
   MockMediaDevicesEventSubscriber subscriber1, subscriber2;
-  url::Origin security_origin(GURL("http://localhost"));
-  EXPECT_CALL(media_devices_dispatcher_,
-              SubscribeDeviceChangeNotifications(MEDIA_DEVICE_TYPE_AUDIO_INPUT,
-                                                 _, security_origin))
+  EXPECT_CALL(media_devices_dispatcher_, SubscribeDeviceChangeNotifications(
+                                             MEDIA_DEVICE_TYPE_AUDIO_INPUT, _))
       .Times(2);
-  EXPECT_CALL(media_devices_dispatcher_,
-              SubscribeDeviceChangeNotifications(MEDIA_DEVICE_TYPE_VIDEO_INPUT,
-                                                 _, security_origin))
+  EXPECT_CALL(media_devices_dispatcher_, SubscribeDeviceChangeNotifications(
+                                             MEDIA_DEVICE_TYPE_VIDEO_INPUT, _))
       .Times(2);
-  EXPECT_CALL(media_devices_dispatcher_,
-              SubscribeDeviceChangeNotifications(MEDIA_DEVICE_TYPE_AUDIO_OUTPUT,
-                                                 _, security_origin))
+  EXPECT_CALL(media_devices_dispatcher_, SubscribeDeviceChangeNotifications(
+                                             MEDIA_DEVICE_TYPE_AUDIO_OUTPUT, _))
       .Times(2);
   auto subscription_list_1 =
       event_dispatcher_->SubscribeDeviceChangeNotifications(
-          security_origin,
           base::Bind(&MockMediaDevicesEventSubscriber::EventDispatched,
                      base::Unretained(&subscriber1)));
   auto subscription_list_2 =
       event_dispatcher_->SubscribeDeviceChangeNotifications(
-          security_origin,
           base::Bind(&MockMediaDevicesEventSubscriber::EventDispatched,
                      base::Unretained(&subscriber2)));