Media Related changes for TabCapture API

content/browser/renderer_host/media/video_capture_manager.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 "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 155 matching lines @@
         media::FakeVideoCaptureDevice::Create(vc_device_name);
   } else {
     switch (device.stream_type) {
       case content::MEDIA_DEVICE_VIDEO_CAPTURE:
         video_capture_device =
             media::VideoCaptureDevice::Create(vc_device_name);
         break;
       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.
+        vc_device_name.unique_id = "/dev/video1";
         video_capture_device =
             media::FakeVideoCaptureDevice::Create(vc_device_name);
         break;
       default:
         NOTIMPLEMENTED();
         break;
     }
   }
   if (!video_capture_device) {
     PostOnError(capture_session_id, kDeviceNotAvailable);
     return;
   }
 
   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);
 }
 
 void VideoCaptureManager::OnClose(int capture_session_id) {
   DCHECK(IsOnDeviceThread());
   DVLOG(1) << "VideoCaptureManager::OnClose, id " << capture_session_id;
 
   VideoCaptureDevices::iterator device_it = devices_.find(capture_session_id);
   if (device_it == devices_.end()) {
     return;
@@ skipping 324 matching lines @@
 
     VideoCaptureDevices::iterator dit = devices_.find(capture_session_id);
     if (dit != devices_.end()) {
       return dit->second.capture_device;
     }
   }
   return NULL;
 }
 
 }  // namespace media_stream