Remove dead code related to media device enumerations and monitoring.

content/browser/renderer_host/media/media_stream_manager.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.
 
-// MediaStreamManager is used to open/enumerate media capture devices (video
-// supported now). Call flow:
+// MediaStreamManager is used to open media capture devices (video supported
+// now). Call flow:
 // 1. GenerateStream is called when a render process wants to use a capture
 //    device.
 // 2. MediaStreamManager will ask MediaStreamUIController for permission to
 //    use devices and for which device to use.
 // 3. MediaStreamManager will request the corresponding media device manager(s)
 //    to enumerate available devices. The result will be given to
 //    MediaStreamUIController.
 // 4. MediaStreamUIController will, by posting the request to UI, let the
 //    users to select which devices to use and send callback to
 //    MediaStreamManager with the result.
@@ skipping 116 matching lines @@
 
   // Cancel all requests for the given |render_process_id|.
   void CancelAllRequests(int render_process_id);
 
   // Closes the stream device for a certain render frame. The stream must have
   // been opened by a call to GenerateStream.
   void StopStreamDevice(int render_process_id,
                         int render_frame_id,
                         const std::string& device_id);
 
-  // Gets a list of devices of |type|, which must be MEDIA_DEVICE_AUDIO_CAPTURE
-  // or MEDIA_DEVICE_VIDEO_CAPTURE.
-  // The request is identified using the string returned to the caller.
-  // When the |requester| is NULL, MediaStreamManager will enumerate both audio
-  // and video devices and also start monitoring device changes, such as
-  // plug/unplug. The new device lists will be delivered via media observer to
-  // MediaCaptureDevicesDispatcher.
-  virtual std::string EnumerateDevices(MediaStreamRequester* requester,
-                                       int render_process_id,
-                                       int render_frame_id,
-                                       const std::string& salt,
-                                       int page_request_id,
-                                       MediaStreamType type,
-                                       const url::Origin& security_origin);
-
   // Open a device identified by |device_id|.  |type| must be either
   // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE.
   // The request is identified using string returned to the caller.
   void OpenDevice(MediaStreamRequester* requester,
                   int render_process_id,
                   int render_frame_id,
                   const std::string& salt,
                   int page_request_id,
                   const std::string& device_id,
                   MediaStreamType type,
@@ skipping 52 matching lines @@
   void UseFakeUIForTests(std::unique_ptr<FakeMediaStreamUIProxy> fake_ui);
 
   // Register and unregister a new callback for receiving native log entries.
   // The registered callback will be invoked on the IO thread.
   // The registration and unregistration will be done asynchronously so it is
   // not guaranteed that when the call returns the operation has completed.
   void RegisterNativeLogCallback(int renderer_host_id,
       const base::Callback<void(const std::string&)>& callback);
   void UnregisterNativeLogCallback(int renderer_host_id);
 
-  // Register and unregister subscribers for device-change notifications.
-  // It is an error to try to subscribe a |subscriber| that is already
-  // subscribed or to cancel the subscription of a |subscriber| that is not
-  // subscribed. Also, subscribers must make sure to invoke
-  // CancelDeviceChangeNotifications() before destruction. Otherwise, dangling
-  // pointers and use-after-destruction problems will occur.
-  void SubscribeToDeviceChangeNotifications(MediaStreamRequester* subscriber);
-  void CancelDeviceChangeNotifications(MediaStreamRequester* subscriber);
-
   // Generates a hash of a device's unique ID usable by one
   // particular security origin.
   static std::string GetHMACForMediaDeviceID(const std::string& salt,
                                              const url::Origin& security_origin,
                                              const std::string& raw_unique_id);
 
   // Convenience method to check if |device_guid| is an HMAC of
   // |raw_device_id| for |security_origin|.
   static bool DoesMediaDeviceIDMatchHMAC(const std::string& salt,
                                          const url::Origin& security_origin,
@@ skipping 14 matching lines @@
   // Helper for sending up-to-date device lists to media observer when a
   // capture device is plugged in or unplugged.
   void NotifyDevicesChanged(MediaDeviceType stream_type,
                             const MediaDeviceInfoArray& devices);
 
   // This method is called when an audio or video device is removed. It makes
   // sure all MediaStreams that use a removed device are stopped and that the
   // render process is notified.
   void StopRemovedDevice(MediaDeviceType type, const MediaDeviceInfo& device);
 
-  // TODO(guidou): Remove this function once handling for renderer requests for
-  // device-event notifications is moved out of MediaStreamDispatcherHost.
-  // See http://crbug.com/648183.
-  void NotifyDeviceChangeSubscribers(MediaStreamType type);
-
   void SetGenerateStreamCallbackForTesting(
       GenerateStreamTestCallback test_callback);
 
  private:
   // Contains all data needed to keep track of requests.
   class DeviceRequest;
 
   // |DeviceRequests| is a list to ensure requests are processed in the order
   // they arrive. The first member of the pair is the label of the
   // |DeviceRequest|.
   using LabeledDeviceRequest = std::pair<std::string, DeviceRequest*>;
   using DeviceRequests = std::list<LabeledDeviceRequest>;
 
   // Initializes the device managers on IO thread.  Auto-starts the device
   // thread and registers this as a listener with the device managers.
   void InitializeDeviceManagersOnIOThread();
 
-
   // |output_parameters| contains real values only if the request requires it.
   void HandleAccessRequestResponse(
       const std::string& label,
       const media::AudioParameters& output_parameters,
       const MediaStreamDevices& devices,
       content::MediaStreamRequestResult result);
   void StopMediaStreamFromBrowser(const std::string& label);
 
-  void DoEnumerateDevices(const std::string& label);
-
-  void AudioOutputDevicesEnumerated(const std::string& label,
-                                    const MediaDeviceEnumeration& enumeration);
-
   // Helpers.
   // Checks if all devices that was requested in the request identififed by
   // |label| has been opened and set the request state accordingly.
   void HandleRequestDone(const std::string& label,
                          DeviceRequest* request);
   // Stop the use of the device associated with |session_id| of type |type| in
   // all |requests_|. The device is removed from the request. If a request
   /// doesn't use any devices as a consequence, the request is deleted.
   void StopDevice(MediaStreamType type, int session_id);
   // Calls the correct capture manager and close the device with |session_id|.
@@ skipping 45 matching lines @@
       MediaRequestState* existing_request_state) const;
 
   void FinalizeGenerateStream(const std::string& label, DeviceRequest* request);
   void FinalizeRequestFailed(const std::string& label,
                              DeviceRequest* request,
                              content::MediaStreamRequestResult result);
   void FinalizeOpenDevice(const std::string& label, DeviceRequest* request);
   void FinalizeMediaAccessRequest(const std::string& label,
                                   DeviceRequest* request,
                                   const MediaStreamDevices& devices);
-  void FinalizeEnumerateDevices(const std::string& label,
-                                DeviceRequest* request);
   void HandleCheckMediaAccessResponse(const std::string& label,
                                       bool have_access);
 
   // Picks a device ID from a list of required and alternate device IDs,
   // presented as part of a TrackControls structure.
   // Either the required device ID is picked (if present), or the first
   // valid alternate device ID.
   // Returns false if the required device ID is present and invalid.
   // Otherwise, if no valid device is found, device_id is unchanged.
   bool PickDeviceId(const std::string& salt,
@@ skipping 22 matching lines @@
   void DoNativeLogCallbackRegistration(int renderer_host_id,
       const base::Callback<void(const std::string&)>& callback);
   void DoNativeLogCallbackUnregistration(int renderer_host_id);
 
   // Callback to handle the reply to a low-level enumeration request.
   void DevicesEnumerated(bool requested_audio_input,
                          bool requested_video_input,
                          const std::string& label,
                          const MediaDeviceEnumeration& enumeration);
 
-  // TODO(guidou): Remove once handling of renderer-issued enumeration requests
-  // is moved out of MediaStreamManager. See http://crbug.com/648183.
-  void ProcessEnumerationRequest(const std::string& label,
-                                 DeviceRequest* request,
-                                 MediaStreamType stream_type,
-                                 const MediaDeviceInfoArray& enumeration);
-
-  // TODO(guidou): Remove this function once the concept of open enumeration
-  // requests is eliminated. See http://crbug.com/648183.
-  void ProcessOpenEnumerationRequests(MediaStreamType stream_type,
-                                      const MediaDeviceInfoArray& devices);
-
   // Task runner shared by VideoCaptureManager and AudioInputDeviceManager and
   // used for enumerating audio output devices.
   // Note: Enumeration tasks may take seconds to complete so must never be run
   // on any of the BrowserThreads (UI, IO, etc).  See http://crbug.com/256945.
   scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
 
   media::AudioManager* const audio_manager_;  // not owned
   scoped_refptr<AudioInputDeviceManager> audio_input_device_manager_;
   scoped_refptr<VideoCaptureManager> video_capture_manager_;
 #if defined(OS_WIN)
   base::Thread video_capture_thread_;
 #endif
 
   std::unique_ptr<MediaDevicesManager> media_devices_manager_;
 
   // All non-closed request. Must be accessed on IO thread.
   DeviceRequests requests_;
 
   bool use_fake_ui_;
   std::unique_ptr<FakeMediaStreamUIProxy> fake_ui_;
 
   // Maps render process hosts to log callbacks. Used on the IO thread.
   std::map<int, base::Callback<void(const std::string&)>> log_callbacks_;
 
-  // Objects subscribed to changes in the set of media devices.
-  std::vector<MediaStreamRequester*> device_change_subscribers_;
-
   GenerateStreamTestCallback generate_stream_test_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaStreamManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_MEDIA_STREAM_MANAGER_H_