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

extensions/browser/api/web_request/web_request_api.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 "extensions/browser/api/web_request/web_request_api.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 558 matching lines @@
     int extra_info_spec) {
   std::unique_ptr<WebRequestEventDetails> event_details(
       new WebRequestEventDetails(request, extra_info_spec));
 
   return event_details;
 }
 
 int ExtensionWebRequestEventRouter::OnBeforeRequest(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     GURL* new_url) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   if (ShouldHideEvent(browser_context, extension_info_map, request,
                       navigation_ui_data)) {
     return net::OK;
   }
 
   if (IsPageLoad(request))
     NotifyPageLoad();
 
   request_time_tracker_->LogRequestStartTime(request->identifier(),
                                              base::Time::Now(),
@@ skipping 39 matching lines @@
     // to modify the request and we can respond synchronously.
     return ExecuteDeltas(browser_context, request->identifier(),
                          navigation_ui_data, false /* call_callback*/);
   }
   return net::ERR_IO_PENDING;
 }
 
 int ExtensionWebRequestEventRouter::OnBeforeSendHeaders(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     net::HttpRequestHeaders* headers) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   if (ShouldHideEvent(browser_context, extension_info_map, request,
                       navigation_ui_data)) {
     return net::OK;
   }
 
   bool initialize_blocked_requests = false;
 
   initialize_blocked_requests |= ProcessDeclarativeRules(
       browser_context, extension_info_map, keys::kOnBeforeSendHeadersEvent,
       request, navigation_ui_data, ON_BEFORE_SEND_HEADERS, NULL);
@@ skipping 29 matching lines @@
     // to modify the request and we can respond synchronously.
     return ExecuteDeltas(browser_context, request->identifier(),
                          navigation_ui_data, false /* call_callback*/);
   }
   return net::ERR_IO_PENDING;
 }
 
 void ExtensionWebRequestEventRouter::OnSendHeaders(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     const net::HttpRequestHeaders& headers) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   if (ShouldHideEvent(browser_context, extension_info_map, request,
                       navigation_ui_data))
     return;
 
   if (GetAndSetSignaled(request->identifier(), kOnSendHeaders))
     return;
 
   ClearSignaled(request->identifier(), kOnBeforeRedirect);
 
   int extra_info_spec = 0;
   RawListeners listeners = GetMatchingListeners(
       browser_context, extension_info_map, navigation_ui_data,
       keys::kOnSendHeadersEvent, request, &extra_info_spec);
   if (listeners.empty())
     return;
 
   std::unique_ptr<WebRequestEventDetails> event_details(
       CreateEventDetails(request, extra_info_spec));
   event_details->SetRequestHeaders(headers);
 
   DispatchEvent(browser_context, request, listeners, navigation_ui_data,
                 std::move(event_details));
 }
 
 int ExtensionWebRequestEventRouter::OnHeadersReceived(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     const net::HttpResponseHeaders* original_response_headers,
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
     GURL* allowed_unsafe_redirect_url) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   if (ShouldHideEvent(browser_context, extension_info_map, request,
                       navigation_ui_data)) {
     return net::OK;
   }
 
   bool initialize_blocked_requests = false;
 
   initialize_blocked_requests |= ProcessDeclarativeRules(
       browser_context, extension_info_map, keys::kOnHeadersReceivedEvent,
       request, navigation_ui_data, ON_HEADERS_RECEIVED,
@@ skipping 34 matching lines @@
     return ExecuteDeltas(browser_context, request->identifier(),
                          navigation_ui_data, false /* call_callback*/);
   }
   return net::ERR_IO_PENDING;
 }
 
 net::NetworkDelegate::AuthRequiredResponse
 ExtensionWebRequestEventRouter::OnAuthRequired(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     const net::AuthChallengeInfo& auth_info,
     const net::NetworkDelegate::AuthCallback& callback,
     net::AuthCredentials* credentials) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   // No browser_context means that this is for authentication challenges in the
   // system context. Skip in that case. Also skip sensitive requests.
   if (!browser_context ||
       WebRequestPermissions::HideRequest(extension_info_map, request,
                                          navigation_ui_data)) {
     return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;
   }
 
   int extra_info_spec = 0;
   RawListeners listeners = GetMatchingListeners(
@@ skipping 17 matching lines @@
     blocked_request.auth_credentials = credentials;
     blocked_request.net_log = &request->net_log();
     return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_IO_PENDING;
   }
   return net::NetworkDelegate::AUTH_REQUIRED_RESPONSE_NO_ACTION;
 }
 
 void ExtensionWebRequestEventRouter::OnBeforeRedirect(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     const GURL& new_location) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   if (ShouldHideEvent(browser_context, extension_info_map, request,
                       navigation_ui_data)) {
     return;
   }
 
   if (GetAndSetSignaled(request->identifier(), kOnBeforeRedirect))
     return;
 
   ClearSignaled(request->identifier(), kOnBeforeRequest);
   ClearSignaled(request->identifier(), kOnBeforeSendHeaders);
@@ skipping 13 matching lines @@
   event_details->SetResponseSource(request);
   event_details->SetString(keys::kRedirectUrlKey, new_location.spec());
 
   DispatchEvent(browser_context, request, listeners, navigation_ui_data,
                 std::move(event_details));
 }
 
 void ExtensionWebRequestEventRouter::OnResponseStarted(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     int net_error) {
   DCHECK_NE(net::ERR_IO_PENDING, net_error);
 
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   if (ShouldHideEvent(browser_context, extension_info_map, request,
                       navigation_ui_data)) {
     return;
   }
 
   // OnResponseStarted is even triggered, when the request was cancelled.
   if (net_error != net::OK)
     return;
 
   int extra_info_spec = 0;
@@ skipping 10 matching lines @@
 
   DispatchEvent(browser_context, request, listeners, navigation_ui_data,
                 std::move(event_details));
 }
 
 // Deprecated.
 // TODO(maksims): Remove this.
 void ExtensionWebRequestEventRouter::OnResponseStarted(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request) {
-  OnResponseStarted(browser_context, extension_info_map, navigation_ui_data,
-                    request, request->status().error());
+  OnResponseStarted(browser_context, extension_info_map, request,
+                    request->status().error());
 }
 
 void ExtensionWebRequestEventRouter::OnCompleted(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     int net_error) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   // We hide events from the system context as well as sensitive requests.
   // However, if the request first became sensitive after redirecting we have
   // already signaled it and thus we have to signal the end of it. This is
   // risk-free because the handler cannot modify the request now.
   if (!browser_context ||
       (WebRequestPermissions::HideRequest(extension_info_map, request,
                                           navigation_ui_data) &&
        !WasSignaled(*request))) {
     return;
   }
@@ skipping 21 matching lines @@
 
   DispatchEvent(browser_context, request, listeners, navigation_ui_data,
                 std::move(event_details));
 }
 
 // Deprecated.
 // TODO(maksims): Remove this.
 void ExtensionWebRequestEventRouter::OnCompleted(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request) {
-  OnCompleted(browser_context, extension_info_map, navigation_ui_data, request,
+  OnCompleted(browser_context, extension_info_map, request,
               request->status().error());
 }
 
 void ExtensionWebRequestEventRouter::OnErrorOccurred(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     bool started,
     int net_error) {
+  ExtensionNavigationUIData* navigation_ui_data =
+      ExtensionsBrowserClient::Get()->GetExtensionNavigationUIData(request);
   // We hide events from the system context as well as sensitive requests.
   // However, if the request first became sensitive after redirecting we have
   // already signaled it and thus we have to signal the end of it. This is
   // risk-free because the handler cannot modify the request now.
   if (!browser_context ||
       (WebRequestPermissions::HideRequest(extension_info_map, request,
                                           navigation_ui_data) &&
        !WasSignaled(*request))) {
     return;
   }
@@ skipping 23 matching lines @@
     event_details->SetBoolean(keys::kFromCache, request->was_cached());
   event_details->SetString(keys::kErrorKey, net::ErrorToString(net_error));
 
   DispatchEvent(browser_context, request, listeners, navigation_ui_data,
                 std::move(event_details));
 }
 
 void ExtensionWebRequestEventRouter::OnErrorOccurred(
     void* browser_context,
     const InfoMap* extension_info_map,
-    ExtensionNavigationUIData* navigation_ui_data,
     net::URLRequest* request,
     bool started) {
-  OnErrorOccurred(browser_context, extension_info_map, navigation_ui_data,
-                  request, started, request->status().error());
+  OnErrorOccurred(browser_context, extension_info_map, request, started,
+                  request->status().error());
 }
 
 void ExtensionWebRequestEventRouter::OnURLRequestDestroyed(
     void* browser_context,
     const net::URLRequest* request) {
   ClearPendingCallbacks(request);
 
   signaled_requests_.erase(request->identifier());
 
   request_time_tracker_->LogRequestEndTime(request->identifier(),
@@ skipping 1332 matching lines @@
   // Since EventListeners are segmented by browser_context, check that
   // last, as it is exceedingly unlikely to be different.
   return extension_id == that.extension_id &&
          sub_event_name == that.sub_event_name &&
          web_view_instance_id == that.web_view_instance_id &&
          embedder_process_id == that.embedder_process_id &&
          browser_context == that.browser_context;
 }
 
 }  // namespace extensions