Media Related changes for TabCapture API

content/browser/renderer_host/media/video_capture_manager.cc

Index: content/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 8ed7a81e70164059bc3580c1a44605deb25b0800..261ef8e19a9068c81621ffafb735371969eef210 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -173,6 +173,8 @@ void VideoCaptureManager::OnOpen(int capture_session_id,
       case content::MEDIA_TAB_VIDEO_CAPTURE:
         // TODO(miu): Replace this stub with the actual implementation in a
         // later change.
+        // TODO(justinlin): This is so we don't get a null device. Remove later.

[miu, 2012/10/12 01:10:50]

Ah!  A race to see which of our changes will land first (this will cause a minor
merge conflict with my pending change 11065004).

+        vc_device_name.unique_id = "/dev/video1";
         video_capture_device =
             media::FakeVideoCaptureDevice::Create(vc_device_name);
         break;
@@ -189,6 +191,7 @@ void VideoCaptureManager::OnOpen(int capture_session_id,
   DeviceEntry& new_entry = devices_[capture_session_id];
   new_entry.stream_type = device.stream_type;
   new_entry.capture_device = video_capture_device;
+
   PostOnOpened(device.stream_type, capture_session_id);
 }