Reland review 34393006: Refactor MediaStreamManager to not output real device id.

media/video/capture/fake_video_capture_device.cc

Index: media/video/capture/fake_video_capture_device.cc
diff --git a/media/video/capture/fake_video_capture_device.cc b/media/video/capture/fake_video_capture_device.cc
index ef44d86488497ef9d7d452f38bc2a8521d6c0863..778cb43445a9d28ff0a578ddec75dec7da024293 100644
--- a/media/video/capture/fake_video_capture_device.cc
+++ b/media/video/capture/fake_video_capture_device.cc
@@ -8,6 +8,7 @@
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -22,14 +23,15 @@ static const int kFakeCaptureCapabilityChangePeriod = 30;
 enum { kNumberOfFakeDevices = 2 };
 
 bool FakeVideoCaptureDevice::fail_next_create_ = false;
+size_t FakeVideoCaptureDevice::number_of_devices_ = kNumberOfFakeDevices;
 
 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 < kNumberOfFakeDevices; n++) {
-    Name name(base::StringPrintf("fake_device_%d", n),
-              base::StringPrintf("/dev/video%d", n));
+  for (size_t n = 0; n < number_of_devices_; n++) {
+    Name name("fake_device_" + base::IntToString(n),
+              "/dev/video" + base::IntToString(n));
     device_names->push_back(name);
   }
 }
@@ -51,8 +53,8 @@ VideoCaptureDevice* FakeVideoCaptureDevice::Create(const Name& device_name) {
     fail_next_create_ = false;
     return NULL;
   }
-  for (int n = 0; n < kNumberOfFakeDevices; ++n) {
-    std::string possible_id = base::StringPrintf("/dev/video%d", n);
+  for (size_t n = 0; n < number_of_devices_; ++n) {
+    std::string possible_id = "/dev/video" + base::IntToString(n);
     if (device_name.id().compare(possible_id) == 0) {
       return new FakeVideoCaptureDevice();
     }
@@ -64,6 +66,10 @@ void FakeVideoCaptureDevice::SetFailNextCreate() {
   fail_next_create_ = true;
 }
 
+void FakeVideoCaptureDevice::SetNumberOfFakeDevices(size_t number_of_devices) {
+  number_of_devices_ = number_of_devices;

[tommi (sloooow) - chröme, 2013/11/26 14:44:21]

this looks like a candidate for tsan reports.  is there some other way we can
change the number of devices?

the whole implementation fo FakeVideoCaptureDevice looks racy to me btw :-/

[perkj_chrome, 2013/11/27 13:41:34]

Right- I filed crbug/323913 to cleanup MSM to not have test code. 
I made number_of_devices_ to be atomic to make sure tsan do not complain even
though it will be set on the IO thread and read from the device thread. Note
that it will only ever be set on the IO thread.

+}
+
 FakeVideoCaptureDevice::FakeVideoCaptureDevice()
     : state_(kIdle),
       capture_thread_("CaptureThread"),