Media Related changes for TabCapture API

content/renderer/media/media_stream_dispatcher.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/renderer/media/media_stream_dispatcher.h"
 
 #include "base/logging.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
 #include "content/renderer/render_view_impl.h"
@@ skipping 54 matching lines @@
 }
 
 MediaStreamDispatcher::~MediaStreamDispatcher() {}
 
 void MediaStreamDispatcher::GenerateStream(
     int request_id,
     const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
     media_stream::StreamOptions components,
     const GURL& security_origin) {
   DCHECK(main_loop_->BelongsToCurrentThread());
+  requests_.push_back(Request(event_handler, request_id, next_ipc_id_));
+
+  if (components.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE ||

[perkj_chrome, 2012/10/11 08:01:54]

Why did you you keep MediaStreamHostMsg_GenerateStreamForDevice? If you want to
clean it up in a separate cl that is fine. Just  add a todo with your name.

[justinlin, 2012/10/11 19:41:51]

Done. Moved it to the host part and added TODO there. There's more plumbing to
be done to get rid of it completely..

+      components.video_type == content::MEDIA_TAB_VIDEO_CAPTURE) {
+    DVLOG(1) << "MediaStreamDispatcher::GenerateStreamForDevice("
+             << request_id << ")";
+    Send(new MediaStreamHostMsg_GenerateStreamForDevice(
+        routing_id(), next_ipc_id_++, components, components.video_device_id,
+        security_origin));
+    return;
+  }
+
   DVLOG(1) << "MediaStreamDispatcher::GenerateStream(" << request_id << ")";
-
-  requests_.push_back(Request(event_handler, request_id, next_ipc_id_));
   Send(new MediaStreamHostMsg_GenerateStream(routing_id(),
                                              next_ipc_id_++,
                                              components,
                                              security_origin));
 }
 
-void MediaStreamDispatcher::GenerateStreamForDevice(
-    int request_id,
-    const base::WeakPtr<MediaStreamDispatcherEventHandler>& event_handler,
-    media_stream::StreamOptions components,
-    const std::string& device_id,
-    const GURL& security_origin) {
-  DCHECK(main_loop_->BelongsToCurrentThread());
-  DVLOG(1) << "MediaStreamDispatcher::GenerateStreamForDevice("
-           << request_id << ")";
-
-  requests_.push_back(Request(event_handler, request_id, next_ipc_id_));
-  Send(new MediaStreamHostMsg_GenerateStreamForDevice(routing_id(),
-                                                      next_ipc_id_++,
-                                                      components,
-                                                      device_id,
-                                                      security_origin));
-}
-
 void MediaStreamDispatcher::CancelGenerateStream(int request_id) {
   DCHECK(main_loop_->BelongsToCurrentThread());
   DVLOG(1) << "MediaStreamDispatcher::CancelGenerateStream"
            << ", {request_id = " << request_id << "}";
 
   RequestList::iterator it = requests_.begin();
   for (; it != requests_.end(); ++it) {
     Request& request = *it;
     if (request.request_id == request_id) {
       requests_.erase(it);
@@ skipping 323 matching lines @@
 
 int MediaStreamDispatcher::video_session_id(const std::string& label,
                                             int index) {
   LabelStreamMap::iterator it = label_stream_map_.find(label);
   if (it == label_stream_map_.end())
     return media_stream::StreamDeviceInfo::kNoId;
 
   DCHECK_GT(it->second.video_array.size(), static_cast<size_t>(index));
   return it->second.video_array[index].session_id;
 }