Add support for device-change notifications to MediaStreamDispatcher and MediaStreamDispatcherHost

content/browser/renderer_host/media/media_stream_dispatcher_host.h

Index: content/browser/renderer_host/media/media_stream_dispatcher_host.h
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
index 088154bc693f79830a964e7d551bea3499313bbc..18bf7170635961534f2c2bfc4886a63284b6ebbd 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h
@@ -8,8 +8,10 @@
 #include <map>
 #include <string>
 #include <utility>
+#include <vector>
 
 #include "base/macros.h"
+#include "base/memory/weak_ptr.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/media_stream_requester.h"
 #include "content/common/content_export.h"
@@ -20,6 +22,7 @@
 namespace content {
 
 class MediaStreamManager;
+class MediaStreamUIProxy;
 class ResourceContext;
 
 // MediaStreamDispatcherHost is a delegate for Media Stream API messages used by
@@ -28,10 +31,10 @@ class ResourceContext;
 class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
                                                  public MediaStreamRequester {
  public:
-  MediaStreamDispatcherHost(
-      int render_process_id,
-      const ResourceContext::SaltCallback& salt_callback,
-      MediaStreamManager* media_stream_manager);
+  MediaStreamDispatcherHost(int render_process_id,
+                            const ResourceContext::SaltCallback& salt_callback,
+                            MediaStreamManager* media_stream_manager,
+                            bool use_fake_ui = false);
 
   // MediaStreamRequester implementation.
   void StreamGenerated(int render_frame_id,
@@ -93,16 +96,35 @@ class CONTENT_EXPORT MediaStreamDispatcherHost : public BrowserMessageFilter,
   void OnCloseDevice(int render_frame_id,
                      const std::string& label);
 
+  void OnSubscribeToDeviceChangeNotifications(int render_frame_id,
+                                              const GURL& security_origin);
+
+  void OnCancelDeviceChangeNotifications(int render_frame_id);
+
   void StoreRequest(int render_frame_id,
                     int page_request_id,
                     const std::string& label);
 
   bool IsURLAllowed(const GURL& url);
 
+  std::unique_ptr<MediaStreamUIProxy> CreateMediaStreamUIProxy();
+  void HandleCheckAccessResponse(std::unique_ptr<MediaStreamUIProxy> ui_proxy,
+                                 int render_frame_id,
+                                 bool have_access);
+
   int render_process_id_;
   ResourceContext::SaltCallback salt_callback_;
   MediaStreamManager* media_stream_manager_;
 
+  struct DeviceChangeSubscriberInfo {
+    int render_frame_id;
+    GURL security_origin;

[palmer, 2016/04/26 23:25:02]

Here, too.

[Guido Urdaneta, 2016/05/01 11:08:39]

Done.

+  };
+  std::vector<DeviceChangeSubscriberInfo> device_change_subscribers_;
+  bool use_fake_ui_;
+
+  base::WeakPtrFactory<MediaStreamDispatcherHost> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcherHost);
 };