Refactor: Make MediaCaptureDevicesDispatcher have pluggable handlers.

chrome/browser/media/media_capture_devices_dispatcher.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
 
 #include <deque>
 #include <list>
 #include <map>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
+#include "chrome/browser/media/media_access_handler.h"
+#include "chrome/browser/media/permission_bubble_media_access_handler.h"
 #include "content/public/browser/media_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/media_stream_request.h"
 
 class DesktopStreamsRegistry;
 class MediaStreamCaptureIndicator;
 class Profile;
 
@@ skipping 123 matching lines @@
 
   bool IsDesktopCaptureInProgress();
 
   // Only for testing.
   void SetTestAudioCaptureDevices(const content::MediaStreamDevices& devices);
   void SetTestVideoCaptureDevices(const content::MediaStreamDevices& devices);
 
  private:
   friend struct DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
 
-  struct PendingAccessRequest {
-    PendingAccessRequest(const content::MediaStreamRequest& request,
-                         const content::MediaResponseCallback& callback);
-    ~PendingAccessRequest();
-
-    // TODO(gbillock): make the MediaStreamDevicesController owned by
-    // this object when we're using bubbles.
-    content::MediaStreamRequest request;
-    content::MediaResponseCallback callback;
-  };
-  typedef std::deque<PendingAccessRequest> RequestsQueue;
-  typedef std::map<content::WebContents*, RequestsQueue> RequestsQueues;
-
   MediaCaptureDevicesDispatcher();
   ~MediaCaptureDevicesDispatcher() override;
 
   // content::NotificationObserver implementation.
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) override;
 
-  // Helpers for ProcessMediaAccessRequest().
-  void ProcessDesktopCaptureAccessRequest(
-      content::WebContents* web_contents,
-      const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback,
-      const extensions::Extension* extension);
-  void ProcessScreenCaptureAccessRequest(
-      content::WebContents* web_contents,
-      const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback,
-      const extensions::Extension* extension);
-  void ProcessTabCaptureAccessRequest(
-      content::WebContents* web_contents,
-      const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback,
-      const extensions::Extension* extension);
-#if defined(ENABLE_EXTENSIONS)
-  void ProcessMediaAccessRequestFromPlatformAppOrExtension(
-      content::WebContents* web_contents,
-      const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback,
-      const extensions::Extension* extension);
-#endif
-  void ProcessRegularMediaAccessRequest(
-      content::WebContents* web_contents,
-      const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback);
-  void ProcessQueuedAccessRequest(content::WebContents* web_contents);
-  void OnAccessRequestResponse(content::WebContents* web_contents,
-                               const content::MediaStreamDevices& devices,
-                               content::MediaStreamRequestResult result,
-                               scoped_ptr<content::MediaStreamUI> ui);
-
   // Called by the MediaObserver() functions, executed on UI thread.
   void NotifyAudioDevicesChangedOnUIThread();
   void NotifyVideoDevicesChangedOnUIThread();
   void UpdateMediaRequestStateOnUIThread(
       int render_process_id,
       int render_frame_id,
       int page_request_id,
       const GURL& security_origin,
       content::MediaStreamType stream_type,
       content::MediaRequestState state);
   void OnCreatingAudioStreamOnUIThread(int render_process_id,
                                        int render_frame_id);
 
   // Only for testing, a list of cached audio capture devices.
   content::MediaStreamDevices test_audio_devices_;
 
   // Only for testing, a list of cached video capture devices.
   content::MediaStreamDevices test_video_devices_;
 
   // A list of observers for the device update notifications.
   ObserverList<Observer> observers_;
 
   // Flag used by unittests to disable device enumeration.
   bool is_device_enumeration_disabled_;
 
   RequestsQueues pending_requests_;

[Sergey Ulanov, 2015/05/07 01:05:48]

Move this to PermissionBubbleMediaAccessHandler

[changbin, 2015/05/22 05:10:58]

Done.

 
   scoped_refptr<MediaStreamCaptureIndicator> media_stream_capture_indicator_;
 
   scoped_ptr<DesktopStreamsRegistry> desktop_streams_registry_;
 
   content::NotificationRegistrar notifications_registrar_;
 
   // Tracks MEDIA_DESKTOP_VIDEO_CAPTURE sessions which reach the
   // MEDIA_REQUEST_STATE_DONE state.  Sessions are remove when
   // MEDIA_REQUEST_STATE_CLOSING is encountered.
   struct DesktopCaptureSession {
     int render_process_id;
     int render_frame_id;
     int page_request_id;
   };
   typedef std::list<DesktopCaptureSession> DesktopCaptureSessions;
   DesktopCaptureSessions desktop_capture_sessions_;
 
+  // Handlers for processing media access requests.
+  ScopedVector<MediaAccessHandler> media_access_handlers_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_