Revert 170912 - need more delayloads.

media/video/capture/win/video_capture_device_win.h

Index: media/video/capture/win/video_capture_device_win.h
===================================================================
--- media/video/capture/win/video_capture_device_win.h	(revision 170924)
+++ media/video/capture/win/video_capture_device_win.h	(working copy)
@@ -21,7 +21,6 @@
 #include "base/win/scoped_comptr.h"
 #include "media/video/capture/video_capture_device.h"
 #include "media/video/capture/video_capture_types.h"
-#include "media/video/capture/win/capability_list_win.h"
 #include "media/video/capture/win/sink_filter_win.h"
 #include "media/video/capture/win/sink_input_pin_win.h"
 
@@ -49,8 +48,6 @@
   virtual void DeAllocate() OVERRIDE;
   virtual const Name& device_name() OVERRIDE;
 
-  static void GetDeviceNames(Names* device_names);
-
  private:
   enum InternalState {
     kIdle,  // The device driver is opened but camera is not in use.
@@ -59,11 +56,13 @@
     kError  // Error accessing HW functions.
             // User needs to recover by destroying the object.
   };
+  typedef std::map<int, VideoCaptureCapability> CapabilityMap;
 
   // Implements SinkFilterObserver.
   virtual void FrameReceived(const uint8* buffer, int length);
 
   bool CreateCapabilityMap();
+  int GetBestMatchedCapability(int width, int height, int frame_rate);
   void SetErrorState(const char* reason);
 
   Name device_name_;
@@ -83,7 +82,7 @@
   scoped_refptr<SinkFilter> sink_filter_;
 
   // Map of all capabilities this device support.
-  CapabilityList capabilities_;
+  CapabilityMap capabilities_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
 };