[Cross-Site Isolation] Migrate entire MediaStream verticals to be per-RenderFrame.

chrome/browser/extensions/api/desktop_capture/desktop_capture_api.cc

 // Copyright 2013 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/desktop_capture/desktop_capture_api.h"
 
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/desktop_media_list_ash.h"
 #include "chrome/browser/media/desktop_streams_registry.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/media/native_desktop_media_list.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/api/tabs.h"
+#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_util.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_options.h"
 #include "third_party/webrtc/modules/desktop_capture/screen_capturer.h"
 #include "third_party/webrtc/modules/desktop_capture/window_capturer.h"
 
 namespace extensions {
 
@@ skipping 15 matching lines @@
 
 }  // namespace
 
 // static
 void DesktopCaptureChooseDesktopMediaFunction::SetPickerFactoryForTests(
     PickerFactory* factory) {
   g_picker_factory = factory;
 }
 
 DesktopCaptureChooseDesktopMediaFunction::
-    DesktopCaptureChooseDesktopMediaFunction()
-    : render_process_id_(0),
-      render_view_id_(0) {
+    DesktopCaptureChooseDesktopMediaFunction() {
 }
 
 DesktopCaptureChooseDesktopMediaFunction::
     ~DesktopCaptureChooseDesktopMediaFunction() {
   // RenderViewHost may be already destroyed.
   if (render_view_host()) {
     DesktopCaptureRequestsRegistry::GetInstance()->RemoveRequest(
         render_view_host()->GetProcess()->GetID(), request_id_);
   }
 }
@@ skipping 15 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &request_id_));
   args_->Remove(0, NULL);
 
   scoped_ptr<api::desktop_capture::ChooseDesktopMedia::Params> params =
       api::desktop_capture::ChooseDesktopMedia::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   DesktopCaptureRequestsRegistry::GetInstance()->AddRequest(
       render_view_host()->GetProcess()->GetID(), request_id_, this);
 
-  gfx::NativeWindow parent_window = NULL;
-  content::RenderViewHost* render_view = NULL;
+  // |web_contents| is the WebContents for which the stream is created, and will
+  // also be used to determine where to show the picker's UI.
   content::WebContents* web_contents = NULL;
   base::string16 target_name;
   if (params->target_tab) {
     if (!params->target_tab->url) {
       error_ = kNoUrlError;
       return false;
     }
     origin_ = GURL(*(params->target_tab->url)).GetOrigin();
 
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kAllowHttpScreenCapture) &&
         !origin_.SchemeIsSecure()) {
       error_ = kTabUrlNotSecure;
       return false;
     }
     target_name = base::UTF8ToUTF16(origin_.SchemeIsSecure() ?
         net::GetHostAndOptionalPort(origin_) : origin_.spec());
 
     if (!params->target_tab->id) {
       error_ = kNoTabIdError;
       return false;
     }
 
     if (!ExtensionTabUtil::GetTabById(*(params->target_tab->id), GetProfile(),
                                       true, NULL, NULL, &web_contents, NULL)) {
       error_ = kInvalidTabIdError;
       return false;
     }
+    DCHECK(web_contents);
 
-    GURL current_origin_ =
-        web_contents->GetLastCommittedURL().GetOrigin();
-    if (current_origin_ != origin_) {
+    if (origin_ != web_contents->GetLastCommittedURL().GetOrigin()) {
       error_ = kTabUrlChangedError;
       return false;
     }
-
-    // Register to be notified when the tab is closed.
-    Observe(web_contents);
-
-    render_view = web_contents->GetRenderViewHost();
-    parent_window = web_contents->GetTopLevelNativeWindow();
   } else {
     origin_ = GetExtension()->url();
     target_name = base::UTF8ToUTF16(GetExtension()->name());
-    render_view = render_view_host();
-
-    web_contents = GetAssociatedWebContents();
-    if (web_contents) {
-      parent_window = web_contents->GetTopLevelNativeWindow();
-    } else {
-#if defined(USE_ASH)
-      if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
-        parent_window = ash::Shell::GetPrimaryRootWindow();
-#endif
-    }
+    web_contents = content::WebContents::FromRenderViewHost(render_view_host());

[jam, 2014/07/15 02:04:08]

i'm curious why you changed this from "web_contents =
GetAssociatedWebContents();"?

[miu, 2014/07/15 20:37:55]

I had a discussion with sergeyu (original author of this code), and when he saw
how I was doing things in PS1, he said the picker should always be
shown/anchored to the browser owning the WebContents that consumes the stream. 
Thus, the logic change.

(See previous discussion in code review comments for more details.  tl;dr: A
unit test revealed a faulty assumption in the original implementation.)

+    DCHECK(web_contents);
   }
 
-  render_process_id_ = render_view->GetProcess()->GetID();
-  render_view_id_ = render_view->GetRoutingID();
+  // Register to be notified when the tab is closed.
+  Observe(web_contents);
 
   bool show_screens = false;
   bool show_windows = false;
 
   for (std::vector<api::desktop_capture::DesktopCaptureSourceType>::iterator
        it = params->sources.begin(); it != params->sources.end(); ++it) {
     switch (*it) {
       case api::desktop_capture::DESKTOP_CAPTURE_SOURCE_TYPE_NONE:
         error_ = kInvalidSourceNameError;
         return false;
@@ skipping 10 matching lines @@
         error_ = kTabCaptureNotSupportedError;
         return false;
     }
   }
 
   if (!show_screens && !show_windows) {
     error_ = kEmptySourcesListError;
     return false;
   }
 
+  const gfx::NativeWindow parent_window =
+      web_contents->GetTopLevelNativeWindow();
   scoped_ptr<DesktopMediaList> media_list;
   if (g_picker_factory) {
     media_list = g_picker_factory->CreateModel(
         show_screens, show_windows);
     picker_ = g_picker_factory->CreatePicker();
   } else {
 #if defined(USE_ASH)
     if (chrome::IsNativeWindowInAsh(parent_window)) {
       media_list.reset(new DesktopMediaListAsh(
           (show_screens ? DesktopMediaListAsh::SCREENS : 0) |
@@ skipping 33 matching lines @@
   return true;
 }
 
 void DesktopCaptureChooseDesktopMediaFunction::WebContentsDestroyed() {
   Cancel();
 }
 
 void DesktopCaptureChooseDesktopMediaFunction::OnPickerDialogResults(
     content::DesktopMediaID source) {
   std::string result;
-  if (source.type != content::DesktopMediaID::TYPE_NONE) {
+  if (source.type != content::DesktopMediaID::TYPE_NONE &&
+      web_contents()) {
     DesktopStreamsRegistry* registry =
         MediaCaptureDevicesDispatcher::GetInstance()->
         GetDesktopStreamsRegistry();
+    // TODO(miu): Once render_frame_host() is being set, we should register the
+    // exact RenderFrame requesting the stream, not the main RenderFrame.  With
+    // that change, also update
+    // MediaCaptureDevicesDispatcher::ProcessDesktopCaptureAccessRequest().
+    // http://crbug.com/304341
+    content::RenderFrameHost* const main_frame = web_contents()->GetMainFrame();
     result = registry->RegisterStream(
-        render_process_id_,
-        render_view_id_,
+        main_frame->GetProcess()->GetID(),
+        main_frame->GetRoutingID(),
         origin_,
         source,
         GetExtension()->name());
   }
 
   SetResult(new base::StringValue(result));
   SendResponse(true);
 }
 
 DesktopCaptureRequestsRegistry::RequestId::RequestId(int process_id,
@@ skipping 49 matching lines @@
 
 void DesktopCaptureRequestsRegistry::CancelRequest(int process_id,
                                                    int request_id) {
   RequestsMap::iterator it = requests_.find(RequestId(process_id, request_id));
   if (it != requests_.end())
     it->second->Cancel();
 }
 
 
 }  // namespace extensions