Revert 235728 "Removed RunUntilIdle between Stop and Close in UT..."

trunk/src/media/video/capture/video_capture_device.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.
 //
 // VideoCaptureDevice is the abstract base class for realizing video capture
 // device support in Chromium. It provides the interface for OS dependent
 // implementations.
 // The class is created and functions are invoked on a thread owned by
 // VideoCaptureManager. Capturing is done on other threads, depending on the OS
 // specific implementation.
 
 #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_
 
 #include <list>
 #include <string>
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "media/base/media_export.h"
-#include "media/base/video_frame.h"
 #include "media/video/capture/video_capture_types.h"
 
 namespace media {
 
 class MEDIA_EXPORT VideoCaptureDevice {
  public:
   // Represents a capture device name and ID.
   // You should not create an instance of this class directly by e.g. setting
   // various properties directly.  Instead use
   // VideoCaptureDevice::GetDeviceNames to do this for you and if you need to
@@ skipping 71 matching lines @@
      private:
       CaptureApiType capture_api_type_;
     };
 
     CaptureApiClass capture_api_class_;
 #endif  // if defined(OS_WIN)
     // Allow generated copy constructor and assignment.
   };
 
   // Manages a list of Name entries.
-  typedef std::list<Name> Names;
+  class MEDIA_EXPORT Names
+      : public NON_EXPORTED_BASE(std::list<Name>) {
+   public:
+    // Returns NULL if no entry was found by that ID.
+    Name* FindById(const std::string& id);
+
+    // Allow generated copy constructor and assignment.
+  };
 
   class MEDIA_EXPORT Client {
    public:
     virtual ~Client() {}
 
     // Reserve an output buffer into which a video frame can be captured
     // directly. If all buffers are currently busy, returns NULL.
     //
     // The returned VideoFrames will always be allocated with a YV12 format and
     // have dimensions matching |size|. It is the VideoCaptureDevice's
@@ skipping 82 matching lines @@
   // If deallocation is done asynchronously, then the device implementation must
   // ensure that a subsequent AllocateAndStart() operation targeting the same ID
   // would be sequenced through the same task runner, so that deallocation
   // happens first.
   virtual void StopAndDeAllocate() = 0;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_DEVICE_H_