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

trunk/src/media/video/capture/fake_video_capture_device.cc

 // 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.
 
 #include "media/video/capture/fake_video_capture_device.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 
 namespace media {
 
 static const int kFakeCaptureTimeoutMs = 50;
 static const int kFakeCaptureBeepCycle = 20;  // Visual beep every 1s.
 static const int kFakeCaptureCapabilityChangePeriod = 30;
+enum { kNumberOfFakeDevices = 2 };
 
-int FakeVideoCaptureDevice::number_of_fake_devices_ = 2;
 bool FakeVideoCaptureDevice::fail_next_create_ = false;
 
-void FakeVideoCaptureDevice::SetNumberOfFakeDevices(int num) {
-  number_of_fake_devices_ = num;
-}
-
-int FakeVideoCaptureDevice::NumberOfFakeDevices(void) {
-  return number_of_fake_devices_;
-}
-
 void FakeVideoCaptureDevice::GetDeviceNames(Names* const device_names) {
   // Empty the name list.
   device_names->erase(device_names->begin(), device_names->end());
 
-  for (int n = 0; n < number_of_fake_devices_; n++) {
+  for (int n = 0; n < kNumberOfFakeDevices; n++) {
     Name name(base::StringPrintf("fake_device_%d", n),
               base::StringPrintf("/dev/video%d", n));
     device_names->push_back(name);
   }
 }
 
 void FakeVideoCaptureDevice::GetDeviceSupportedFormats(
     const Name& device,
     VideoCaptureCapabilities* formats) {
-  formats->clear();
-  VideoCaptureCapability capture_format_640x480;
-  capture_format_640x480.color = media::PIXEL_FORMAT_I420;
-  capture_format_640x480.width = 640;
-  capture_format_640x480.height = 480;
-  capture_format_640x480.frame_rate = 1000 / kFakeCaptureTimeoutMs;
-  formats->push_back(capture_format_640x480);
-  VideoCaptureCapability capture_format_320x240;
-  capture_format_320x240.color = media::PIXEL_FORMAT_I420;
-  capture_format_320x240.width = 320;
-  capture_format_320x240.height = 240;
-  capture_format_320x240.frame_rate = 1000 / kFakeCaptureTimeoutMs;
-  formats->push_back(capture_format_320x240);
+  VideoCaptureCapability capture_format;
+  capture_format.color = media::PIXEL_FORMAT_I420;
+  capture_format.width = 640;
+  capture_format.height = 480;
+  capture_format.frame_rate = 1000 / kFakeCaptureTimeoutMs;
+  formats->push_back(capture_format);
 }
 
 VideoCaptureDevice* FakeVideoCaptureDevice::Create(const Name& device_name) {
   if (fail_next_create_) {
     fail_next_create_ = false;
     return NULL;
   }
-  for (int n = 0; n < number_of_fake_devices_; ++n) {
+  for (int n = 0; n < kNumberOfFakeDevices; ++n) {
     std::string possible_id = base::StringPrintf("/dev/video%d", n);
     if (device_name.id().compare(possible_id) == 0) {
       return new FakeVideoCaptureDevice();
     }
   }
   return NULL;
 }
 
 void FakeVideoCaptureDevice::SetFailNextCreate() {
   fail_next_create_ = true;
@@ skipping 168 matching lines @@
       media::VideoCaptureCapability(800,
                                     600,
                                     30,
                                     PIXEL_FORMAT_I420,
                                     VariableResolutionVideoCaptureDevice));
 
   capabilities_roster_index_ = 0;
 }
 
 }  // namespace media