Revert 274608 "Implement getMediaDevices."

content/renderer/media/media_stream_impl.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 CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/common/content_export.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
 #include "content/renderer/media/media_stream_source.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
-#include "third_party/WebKit/public/web/WebMediaDevicesRequest.h"
 #include "third_party/WebKit/public/web/WebUserMediaClient.h"
 #include "third_party/WebKit/public/web/WebUserMediaRequest.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 
 namespace content {
 class PeerConnectionDependencyFactory;
 class MediaStreamDispatcher;
 class MediaStreamVideoSource;
 class VideoCapturerDelegate;
 
@@ skipping 14 matching lines @@
       RenderView* render_view,
       MediaStreamDispatcher* media_stream_dispatcher,
       PeerConnectionDependencyFactory* dependency_factory);
   virtual ~MediaStreamImpl();
 
   // blink::WebUserMediaClient implementation
   virtual void requestUserMedia(
       const blink::WebUserMediaRequest& user_media_request);
   virtual void cancelUserMediaRequest(
       const blink::WebUserMediaRequest& user_media_request);
-  virtual void requestMediaDevices(
-      const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE;
-  virtual void cancelMediaDevicesRequest(
-      const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE;
 
   // MediaStreamDispatcherEventHandler implementation.
   virtual void OnStreamGenerated(
       int request_id,
       const std::string& label,
       const StreamDeviceInfoArray& audio_array,
       const StreamDeviceInfoArray& video_array) OVERRIDE;
   virtual void OnStreamGenerationFailed(
       int request_id,
       content::MediaStreamRequestResult result) OVERRIDE;
@@ skipping 18 matching lines @@
 
   // These methods are virtual for test purposes. A test can override them to
   // test requesting local media streams. The function notifies WebKit that the
   // |request| have completed.
   virtual void GetUserMediaRequestSucceeded(
        const blink::WebMediaStream& stream,
        blink::WebUserMediaRequest* request_info);
   virtual void GetUserMediaRequestFailed(
       blink::WebUserMediaRequest* request_info,
       content::MediaStreamRequestResult result);
-  virtual void EnumerateDevicesSucceded(
-      blink::WebMediaDevicesRequest* request,
-      blink::WebVector<blink::WebMediaDeviceInfo>& devices);
+
   // Creates a MediaStreamVideoSource object.
   // This is virtual for test purposes.
   virtual MediaStreamVideoSource* CreateVideoSource(
       const StreamDeviceInfo& device,
       const MediaStreamSource::SourceStoppedCallback& stop_callback);
 
  private:
   // Class for storing information about a WebKit request to create a
   // MediaStream.
   class UserMediaRequestInfo
@@ skipping 50 matching lines @@
                       const blink::WebMediaStreamSource& source)
         : frame(frame), source(source) {
     }
     // |frame| is the WebFrame that requested |source|. NULL in unit tests.
     // TODO(perkj): Change so that |frame| is not NULL in unit tests.
     blink::WebFrame* frame;
     blink::WebMediaStreamSource source;
   };
   typedef std::vector<LocalStreamSource> LocalStreamSources;
 
-  struct MediaDevicesRequestInfo;
-  typedef ScopedVector<MediaDevicesRequestInfo> MediaDevicesRequests;
-
   // Creates a WebKit representation of stream sources based on
   // |devices| from the MediaStreamDispatcher.
   void InitializeSourceObject(
       const StreamDeviceInfo& device,
       blink::WebMediaStreamSource::Type type,
       const blink::WebMediaConstraints& constraints,
       blink::WebFrame* frame,
       blink::WebMediaStreamSource* webkit_source);
 
   void CreateVideoTracks(
@@ skipping 12 matching lines @@
   // underlying media sources and tracks have been created and started.
   void OnCreateNativeTracksCompleted(
       UserMediaRequestInfo* request,
       content::MediaStreamRequestResult result);
 
   UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id);
   UserMediaRequestInfo* FindUserMediaRequestInfo(
       const blink::WebUserMediaRequest& request);
   void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request);
 
-  MediaDevicesRequestInfo* FindMediaDevicesRequestInfo(int request_id);
-  MediaDevicesRequestInfo* FindMediaDevicesRequestInfo(
-      const blink::WebMediaDevicesRequest& request);
-  void DeleteMediaDevicesRequestInfo(MediaDevicesRequestInfo* request);
-
   // Returns the source that use a device with |device.session_id|
   // and |device.device.id|. NULL if such source doesn't exist.
   const blink::WebMediaStreamSource* FindLocalSource(
       const StreamDeviceInfo& device) const;
 
   void StopLocalSource(const blink::WebMediaStreamSource& source,
                        bool notify_dispatcher);
 
   // Weak ref to a PeerConnectionDependencyFactory, owned by the RenderThread.
   // It's valid for the lifetime of RenderThread.
   // TODO(xians): Remove this dependency once audio do not need it for local
   // audio.
   PeerConnectionDependencyFactory* dependency_factory_;
 
   // media_stream_dispatcher_ is a weak reference, owned by RenderView. It's
   // valid for the lifetime of RenderView.
   MediaStreamDispatcher* media_stream_dispatcher_;
 
   LocalStreamSources local_sources_;
 
   UserMediaRequests user_media_requests_;
 
-  // Requests to enumerate media devices.
-  MediaDevicesRequests media_devices_requests_;
-
   DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_