Reland of PlzNavigate: send SourceLocation when mixed content is found

content/renderer/render_frame_impl.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 "content/renderer/render_frame_impl.h"
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 3466 matching lines @@
     NavigationPolicyInfo info(request);
     info.navigationType = pending_navigation_info_->navigation_type;
     info.defaultPolicy = pending_navigation_info_->policy;
     info.replacesCurrentHistoryItem =
         pending_navigation_info_->replaces_current_history_item;
     info.isHistoryNavigationInNewChildFrame =
         pending_navigation_info_->history_navigation_in_new_child_frame;
     info.isClientRedirect = pending_navigation_info_->client_redirect;
     info.isCacheDisabled = pending_navigation_info_->cache_disabled;
     info.form = pending_navigation_info_->form;
+    info.sourceLocation = pending_navigation_info_->source_location;
 
     pending_navigation_info_.reset(nullptr);
 
     BeginNavigation(info);
   }
 
   DocumentState* document_state = DocumentState::FromDataSource(data_source);
   NavigationStateImpl* navigation_state = static_cast<NavigationStateImpl*>(
       document_state->navigation_state());
   bool is_top_most = !frame_->parent();
@@ skipping 2249 matching lines @@
   // calling this on the WebView?
   if (auto* webview = render_view_->GetWebView())
     webview->clearFocusedElement();
 }
 
 void RenderFrameImpl::OnBlinkFeatureUsageReport(const std::set<int>& features) {
   frame_->blinkFeatureUsageReport(features);
 }
 
 void RenderFrameImpl::OnMixedContentFound(
-    const GURL& main_resource_url,
-    const GURL& mixed_content_url,
-    RequestContextType request_context_type,
-    bool was_allowed,
-    bool had_redirect) {
-  auto request_context =
-      static_cast<blink::WebURLRequest::RequestContext>(request_context_type);
-  frame_->mixedContentFound(main_resource_url, mixed_content_url,
-                            request_context, was_allowed, had_redirect);
+    const FrameMsg_MixedContentFound_Params& params) {
+  blink::WebSourceLocation source_location;
+  source_location.url = WebString::fromLatin1(params.source_location.url);
+  source_location.lineNumber = params.source_location.line_number;
+  source_location.columnNumber = params.source_location.column_number;
+  auto request_context = static_cast<blink::WebURLRequest::RequestContext>(
+      params.request_context_type);
+  frame_->mixedContentFound(params.main_resource_url, params.mixed_content_url,
+                            request_context, params.was_allowed,
+                            params.had_redirect, source_location);
 }
 
 #if defined(OS_ANDROID)
 void RenderFrameImpl::OnActivateNearestFindResult(int request_id,
                                                   float x,
                                                   float y) {
   WebRect selection_rect;
   int ordinal =
       frame_->selectNearestFindMatch(WebFloatPoint(x, y), &selection_rect);
   if (ordinal == -1) {
@@ skipping 1142 matching lines @@
   // And then the mouse event is forwarded to blink, which dispatches it to the
   // event target. Potentially a Pepper plugin will receive the event.
   // In order to tell whether a plugin gets the last mouse event and which it
   // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
   // the event, it will notify us via DidReceiveMouseEvent() and set itself as
   // |pepper_last_mouse_event_target_|.
   pepper_last_mouse_event_target_ = nullptr;
 #endif
 }
 
+RenderFrameImpl::PendingNavigationInfo::PendingNavigationInfo(
+    const NavigationPolicyInfo& info)
+    : navigation_type(info.navigationType),
+      policy(info.defaultPolicy),
+      replaces_current_history_item(info.replacesCurrentHistoryItem),
+      history_navigation_in_new_child_frame(
+          info.isHistoryNavigationInNewChildFrame),
+      client_redirect(info.isClientRedirect),
+      cache_disabled(info.isCacheDisabled),
+      form(info.form),
+      source_location(info.sourceLocation) {}
+
 }  // namespace content