Make TabCapture requests use the target render process and render view id's for UI permissions.

chrome/browser/extensions/api/tab_capture/tab_capture_registry.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 "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
 
 #include "content/public/browser/browser_thread.h"
 #include "chrome/browser/extensions/event_names.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 15 matching lines @@
   proxy_->Attach(this);
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(profile_));
 }
 
 TabCaptureRegistry::~TabCaptureRegistry() {
   proxy_->Detach();
 }
 
 void TabCaptureRegistry::HandleRequestUpdateOnUIThread(
+    int render_process_id,
+    int render_view_id,
     const content::MediaStreamDevice& device,
     const content::MediaRequestState new_state) {
   EventRouter* router = profile_ ?
       extensions::ExtensionSystem::Get(profile_)->event_router() : NULL;
   if (!router)
     return;
 
-  if (requests_.find(device.device_id) == requests_.end())
+  std::pair<int, int> id_pair = std::make_pair(render_process_id,

[no longer working on chromium, 2012/12/07 14:13:10]

nit, use key instead

[justinlin, 2012/12/07 15:50:09]

Done.

+                                               render_view_id);
+
+  if (requests_.find(id_pair) == requests_.end()) {
+    LOG(ERROR) << "Receiving updates for invalid tab capture request.";
     return;
+  }
 
   tab_capture::TabCaptureState state =
       tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_NONE;
   switch (new_state) {
     case content::MEDIA_REQUEST_STATE_REQUESTED:
       state = tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_REQUESTED;
       break;
     case content::MEDIA_REQUEST_STATE_PENDING_APPROVAL:
       state = tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_PENDING;
       break;
     case content::MEDIA_REQUEST_STATE_DONE:
       state = tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_ACTIVE;
       break;
     case content::MEDIA_REQUEST_STATE_CLOSING:
       state = tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_STOPPED;
       break;
     case content::MEDIA_REQUEST_STATE_ERROR:
       state = tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_ERROR;
       break;
     default:
       // TODO(justinlin): Implement muted state notification.
       break;
   }
 
   if (state == tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_NONE) {
     // This is a state we don't handle.
     return;
   }
 
-  TabCaptureRegistry::TabCaptureRequest& request_info =
-      requests_[device.device_id];
+  TabCaptureRegistry::TabCaptureRequest& request_info = requests_[id_pair];
   request_info.status = state;
 
   scoped_ptr<tab_capture::CaptureInfo> info(new tab_capture::CaptureInfo());
   info->tab_id = request_info.tab_id;
   info->status = request_info.status;
 
   scoped_ptr<base::ListValue> args(new ListValue());
   args->Append(info->ToValue().release());
   router->DispatchEventToExtension(request_info.extension_id,
       events::kOnTabCaptureStatusChanged, args.Pass(), profile_, GURL());
@@ skipping 27 matching lines @@
           requests_.erase(it++);
         } else {
           ++it;
         }
       }
       break;
     }
   }
 }
 
-bool TabCaptureRegistry::AddRequest(
-    const std::string& key, const TabCaptureRequest& request) {
+bool TabCaptureRegistry::AddRequest(const std::pair<int, int> key,
+                                    const TabCaptureRequest& request) {
   // Currently, we do not allow multiple active captures for same tab.
-  DCHECK(!key.empty());
   if (requests_.find(key) != requests_.end())
     if (requests_[key].status !=
         tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_STOPPED &&
         requests_[key].status !=
         tab_capture::TAB_CAPTURE_TAB_CAPTURE_STATE_ERROR)
       return false;
   requests_[key] = request;
   return true;
 }
 
-bool TabCaptureRegistry::VerifyRequest(const std::string& key) {
-  return requests_.find(key) != requests_.end();
+bool TabCaptureRegistry::VerifyRequest(int render_process_id,
+                                       int render_view_id) {
+  return requests_.find(std::make_pair(
+      render_process_id, render_view_id)) != requests_.end();
 }
 
 void TabCaptureRegistry::MediaObserverProxy::Attach(
     TabCaptureRegistry* request_handler) {
   handler_ = request_handler;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&TabCaptureRegistry::MediaObserverProxy::
                  RegisterAsMediaObserverOnIOThread, this, false));
 }
 
 void TabCaptureRegistry::MediaObserverProxy::Detach() {
   handler_ = NULL;
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&TabCaptureRegistry::MediaObserverProxy::
                  RegisterAsMediaObserverOnIOThread, this, true));
 }
 
 void TabCaptureRegistry::MediaObserverProxy::RegisterAsMediaObserverOnIOThread(
       bool unregister) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (MediaInternals::GetInstance()) {
     if (!unregister)
       MediaInternals::GetInstance()->AddObserver(this);
     else
       MediaInternals::GetInstance()->RemoveObserver(this);
   }
 }
 
 void TabCaptureRegistry::MediaObserverProxy::OnRequestUpdate(
+    int render_process_id,
+    int render_view_id,
     const content::MediaStreamDevice& device,
     const content::MediaRequestState new_state) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // TODO(justinlin): We drop audio device events since they will occur in
   // parallel with the video device events (we would get duplicate events). When
   // audio mirroring is implemented, we will want to grab those events when
   // video is not requested.
   if (device.type != content::MEDIA_TAB_VIDEO_CAPTURE)
     return;
 
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&TabCaptureRegistry::MediaObserverProxy::UpdateOnUIThread,
-          this, device, new_state));
+          this, render_process_id, render_view_id, device, new_state));
 }
 
 void TabCaptureRegistry::MediaObserverProxy::UpdateOnUIThread(
+    int render_process_id,
+    int render_view_id,
     const content::MediaStreamDevice& device,
     const content::MediaRequestState new_state) {
   if (handler_)
-    handler_->HandleRequestUpdateOnUIThread(device, new_state);
+    handler_->HandleRequestUpdateOnUIThread(render_process_id,
+                                            render_view_id,
+                                            device,
+                                            new_state);
 }
 
 }  // namespace extensions