Make sure the default CSP is used for <webview> with PlzNavigate.

extensions/browser/url_request_util.cc

 // Copyright 2014 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 "extensions/browser/url_request_util.h"
 
 #include <string>
 
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/common/browser_side_navigation_policy.h"
+#include "extensions/browser/extension_navigation_ui_data.h"
+#include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/guest_view/web_view/web_view_renderer_state.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/manifest_handlers/web_accessible_resources_info.h"
 #include "extensions/common/manifest_handlers/webview_info.h"
 #include "net/url_request/url_request.h"
 
 namespace extensions {
 namespace url_request_util {
@@ skipping 98 matching lines @@
 
   if (!ui::PageTransitionIsWebTriggerable(info->GetPageTransition())) {
     *allowed = false;
     return true;
   }
 
   // Couldn't determine if the resource is allowed or not.
   return false;
 }
 
-bool IsWebViewRequest(const net::URLRequest* request) {
+bool IsWebViewRequest(net::URLRequest* request) {
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
   // |info| can be NULL sometimes: http://crbug.com/370070.
   if (!info)
     return false;
-  return WebViewRendererState::GetInstance()->IsGuest(info->GetChildID());
+  if (WebViewRendererState::GetInstance()->IsGuest(info->GetChildID()))
+    return true;
+
+  // GetChildId() is -1 with PlzNavigate for navigation requests, so also try
+  // the ExtensionNavigationUIData data.
+  ExtensionNavigationUIData* data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
+  return data && data->is_web_view();
 }
 
 bool AllowCrossRendererResourceLoadHelper(bool is_guest,
                                           const Extension* extension,
                                           const Extension* owner_extension,
                                           const std::string& partition_id,
                                           const std::string& resource_path,
                                           ui::PageTransition page_transition,
                                           bool* allowed) {
   // |owner_extension == extension| needs to be checked because extension
   // resources should only be accessible to WebViews owned by that extension.
   if (is_guest && owner_extension == extension &&
       WebviewInfo::IsResourceWebviewAccessible(extension, partition_id,
                                                resource_path)) {
     *allowed = true;
     return true;
   }
 
   if (is_guest && !ui::PageTransitionIsWebTriggerable(page_transition)) {
     *allowed = false;
     return true;
   }
 
   return false;
 }
 
 }  // namespace url_request_util
 }  // namespace extensions