Fix nested URL blocking needs with PlzNavigate.

chrome/browser/renderer_host/chrome_navigation_ui_data.cc

 // Copyright 2016 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/renderer_host/chrome_navigation_ui_data.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "content/public/browser/navigation_handle.h"
+#include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_process_host.h"
+#include "content/public/browser/site_instance.h"
+#include "content/public/browser/web_contents.h"
+
+#if defined(ENABLE_EXTENSIONS)
+#include "extensions/browser/extension_registry.h"
+#endif
 
 ChromeNavigationUIData::ChromeNavigationUIData() {}
 
 ChromeNavigationUIData::ChromeNavigationUIData(
     content::NavigationHandle* navigation_handle) {
 #if defined(ENABLE_EXTENSIONS)
+  content::WebContents* web_contents = navigation_handle->GetWebContents();
   SessionTabHelper* session_tab_helper =
-      SessionTabHelper::FromWebContents(navigation_handle->GetWebContents());
+      SessionTabHelper::FromWebContents(web_contents);
   int tab_id = session_tab_helper ? session_tab_helper->session_id().id() : -1;
   int window_id =
       session_tab_helper ? session_tab_helper->window_id().id() : -1;
+  bool from_extension = false;
+  extensions::ExtensionRegistry* registry = extensions::ExtensionRegistry::Get(
+      web_contents->GetBrowserContext());
+  if (registry) {
+    const extensions::Extension* extension =
+        registry->enabled_extensions().GetExtensionOrAppByURL(
+            web_contents->GetSiteInstance()->GetSiteURL());

[alexmos, 2016/10/06 22:37:28]

Wouldn't going via web_contents be wrong for OOP subframes?  Feel like this
should use something like GetRenderFrameHost()->GetSiteInstance(), but reading
the comments on that (and chatting to Nasko), that seems like it might not be
available at this point, since there's no response yet?

One other question Nasko and I had was whether it's possible for PlzNavigate to
use blob with some special inner url/origin, e.g. blob://plznav/{guid}, when
creating the response stream [1], so we can distinguish blobs created by
PlzNavigate from all other blob URLs.  Not sure if Blink ever sees it though,
and whether that might cause it to fail security checks.

[1]
https://cs.chromium.org/chromium/src/content/browser/loader/navigation_resour...

[jam, 2016/10/06 22:54:31]

Right we wouldn't have a RenderFrameHost yet.

Are we going to have OOP subframes for extensions webcontents? 

[alexmos, 2016/10/07 01:47:47]

Yes, with --isolate-extensions, a top-level extensions page could embed a web
iframe, which will be kicked into an OOPIF.  If that iframe navigates under
PlzNavigate, this seems like it will grab the main frame's SiteInstance, rather
than the iframe's.

[jam, 2016/10/10 15:36:50]

Do you have steps I can use to repro this?
i.e. if an extensions page embeds a web iframe, wouldn't that be done with a
webview and that would have a separate WebContents for the webview that would
have the correct site instance?

[alexmos, 2016/10/10 17:04:21]

AFAIK extensions aren't allowed to use <webview>, that's only available in
Chrome apps.  Here's a sample extension where the extension options page embeds
a web iframe: https://bugs.chromium.org/p/chromium/issues/detail?id=487872#c4

[jam, 2016/10/10 21:48:15]

I should have been more precise, I meant guestview. there'll be a separate
webcontents for the extensions options view

+    from_extension = !!extension;
+  }
   extension_data_ = base::MakeUnique<extensions::ExtensionNavigationUIData>(
-      navigation_handle, tab_id, window_id);
+      navigation_handle, from_extension, tab_id, window_id);
 #endif
 }
 
 ChromeNavigationUIData::~ChromeNavigationUIData() {}
 
 std::unique_ptr<content::NavigationUIData> ChromeNavigationUIData::Clone()
     const {
   std::unique_ptr<ChromeNavigationUIData> copy =
       base::MakeUnique<ChromeNavigationUIData>();
 
 #if defined(ENABLE_EXTENSIONS)
   if (extension_data_)
     copy->SetExtensionNavigationUIData(extension_data_->DeepCopy());
 #endif
 
   return std::move(copy);
 }
 
 #if defined(ENABLE_EXTENSIONS)
 void ChromeNavigationUIData::SetExtensionNavigationUIData(
     std::unique_ptr<extensions::ExtensionNavigationUIData> extension_data) {
   extension_data_ = std::move(extension_data);
 }
 #endif