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

extensions/browser/url_request_util.cc

Index: extensions/browser/url_request_util.cc
diff --git a/extensions/browser/url_request_util.cc b/extensions/browser/url_request_util.cc
index 126f69422e2c25e90c1ee590ce7fadb9f9afb7d4..1deb131f2ad1c334961d3bd18ec2800264753e2b 100644
--- a/extensions/browser/url_request_util.cc
+++ b/extensions/browser/url_request_util.cc
@@ -8,6 +8,8 @@
 
 #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"
@@ -126,13 +128,18 @@ bool AllowCrossRendererResourceLoad(net::URLRequest* request,
   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()))

[Fady Samuel, 2016/10/19 15:27:24]

Could you please add a comment why this may not produce the expected result?
Offline comment: GetChildId() might be invalid with PlzNavigate since we don't
have a process yet when you begin a navigation request?

[jam, 2016/10/19 19:19:53]

Done.

+    return true;
+
+  ExtensionNavigationUIData* data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
+  return data && data->is_web_view();
 }
 
 bool AllowCrossRendererResourceLoadHelper(bool is_guest,