| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 7ae0fbf22cffbab58631186cabe423a7404f9a6c..ae1f7498d857e3229a375e4d9f6cc25181f6965c 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -684,12 +684,6 @@
|
| info.sourceLocation.columnNumber);
|
| }
|
|
|
| - CSPDisposition should_check_main_world_csp =
|
| - info.shouldCheckMainWorldContentSecurityPolicy ==
|
| - blink::WebContentSecurityPolicyDispositionCheck
|
| - ? CSPDisposition::CHECK
|
| - : CSPDisposition::DO_NOT_CHECK;
|
| -
|
| const RequestExtraData* extra_data =
|
| static_cast<RequestExtraData*>(info.urlRequest.getExtraData());
|
| DCHECK(extra_data);
|
| @@ -699,8 +693,7 @@
|
| report_type, GURL(), GURL(),
|
| static_cast<PreviewsState>(info.urlRequest.getPreviewsState()),
|
| base::TimeTicks::Now(), info.urlRequest.httpMethod().latin1(),
|
| - GetRequestBodyForWebURLRequest(info.urlRequest), source_location,
|
| - should_check_main_world_csp);
|
| + GetRequestBodyForWebURLRequest(info.urlRequest), source_location);
|
| }
|
|
|
| media::Context3D GetSharedMainThreadContext3D(
|
| @@ -1585,8 +1578,6 @@
|
| OnTextTrackSettingsChanged)
|
| IPC_MESSAGE_HANDLER(FrameMsg_PostMessageEvent, OnPostMessageEvent)
|
| IPC_MESSAGE_HANDLER(FrameMsg_FailedNavigation, OnFailedNavigation)
|
| - IPC_MESSAGE_HANDLER(FrameMsg_ReportContentSecurityPolicyViolation,
|
| - OnReportContentSecurityPolicyViolation)
|
| IPC_MESSAGE_HANDLER(FrameMsg_GetSavableResourceLinks,
|
| OnGetSavableResourceLinks)
|
| IPC_MESSAGE_HANDLER(FrameMsg_GetSerializedHtmlWithLocalLinks,
|
| @@ -5266,12 +5257,6 @@
|
| browser_side_navigation_pending_ = false;
|
| }
|
|
|
| -void RenderFrameImpl::OnReportContentSecurityPolicyViolation(
|
| - const content::CSPViolationParams& violation_params) {
|
| - frame_->reportContentSecurityPolicyViolation(
|
| - BuildWebContentSecurityPolicyViolation(violation_params));
|
| -}
|
| -
|
| WebNavigationPolicy RenderFrameImpl::decidePolicyForNavigation(
|
| const NavigationPolicyInfo& info) {
|
| // A content initiated navigation may have originated from a link-click,
|
|
|