Revert of PlzNavigate: Enforce 'frame-src' CSP on the browser.

content/browser/frame_host/navigation_handle_impl.h

 // Copyright 2015 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
 
 #include "content/public/browser/navigation_handle.h"
 
 #include <stddef.h>
@@ skipping 73 matching lines @@
   // PlzNavigate: This value always comes from the CommonNavigationParams
   // associated with this navigation.
   static std::unique_ptr<NavigationHandleImpl> Create(
       const GURL& url,
       const std::vector<GURL>& redirect_chain,
       FrameTreeNode* frame_tree_node,
       bool is_renderer_initiated,
       bool is_same_page,
       const base::TimeTicks& navigation_start,
       int pending_nav_entry_id,
-      bool started_from_context_menu,
-      CSPDisposition should_check_main_world_csp);
+      bool started_from_context_menu);
   ~NavigationHandleImpl() override;
 
   // Used to track the state the navigation is currently in.
   enum State {
     INITIAL = 0,
     WILL_SEND_REQUEST,
     DEFERRING_START,
     WILL_REDIRECT_REQUEST,
     DEFERRING_REDIRECT,
     CANCELING,
@@ skipping 247 matching lines @@
 
   void set_complete_callback_for_testing(
       const ThrottleChecksFinishedCallback& callback) {
     complete_callback_for_testing_ = callback;
   }
 
   void set_base_url_for_data_url(const GURL& url) {
     base_url_for_data_url_ = url;
   }
 
-  CSPDisposition should_check_main_world_csp() const {
-    return should_check_main_world_csp_;
-  }
-
  private:
   friend class NavigationHandleImplTest;
 
   NavigationHandleImpl(const GURL& url,
                        const std::vector<GURL>& redirect_chain,
                        FrameTreeNode* frame_tree_node,
                        bool is_renderer_initiated,
                        bool is_same_page,
                        const base::TimeTicks& navigation_start,
                        int pending_nav_entry_id,
-                       bool started_from_context_menu,
-                       CSPDisposition should_check_main_world_csp);
+                       bool started_from_context_menu);
 
   NavigationThrottle::ThrottleCheckResult CheckWillStartRequest();
   NavigationThrottle::ThrottleCheckResult CheckWillRedirectRequest();
   NavigationThrottle::ThrottleCheckResult CheckWillProcessResponse();
 
   // Called when WillProcessResponse checks are done, to find the final
   // RenderFrameHost for the navigation. Checks whether the navigation should be
   // transferred. Returns false if the transfer attempt results in the
   // destruction of this NavigationHandle and the navigation should no longer
   // proceed. This can happen when the RenderFrameHostManager determines a
@@ skipping 135 matching lines @@
 
   GURL searchable_form_url_;
   std::string searchable_form_encoding_;
 
   GURL previous_url_;
   GURL base_url_;
   GURL base_url_for_data_url_;
   net::HostPortPair socket_address_;
   NavigationType navigation_type_;
 
-  // Whether or not the CSP of the main world should apply. When the navigation
-  // is initiated from a content script in an isolated world, the CSP defined
-  // in the main world should not apply.
-  CSPDisposition should_check_main_world_csp_;
-
   base::WeakPtrFactory<NavigationHandleImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_