Merge CrossSiteResourceHandler and NavigationResourceThrottle

content/browser/frame_host/render_frame_host_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 10 matching lines @@
 #include "content/browser/site_instance_impl.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/common/referrer.h"
 #include "ui/base/page_transition_types.h"
 #include "url/origin.h"
 
 namespace content {
 class BrowserContext;
 class CrossProcessFrameConnector;
-class CrossSiteTransferringRequest;
 class FrameNavigationEntry;
 class FrameTreeNode;
 class InterstitialPageImpl;
 class NavigationControllerImpl;
 class NavigationEntry;
 class NavigationEntryImpl;
 class NavigationHandleImpl;
 class NavigationRequest;
 class NavigatorTestWithBrowserSideNavigation;
 class RenderFrameHostDelegate;
@@ skipping 250 matching lines @@
   // by the first parameter) to allow the appropriate renderer to approve or
   // deny the request.  |proceed| indicates whether the user chose to proceed.
   // |proceed_time| is the time when the request was allowed to proceed.
   void OnBeforeUnloadACK(bool for_cross_site_transition,
                          bool proceed,
                          const base::TimeTicks& proceed_time);
 
   // The |pending_render_frame_host| is ready to commit a page.  We should
   // ensure that the old RenderFrameHost runs its unload handler first and
   // determine whether a RenderFrameHost transfer is needed.
-  // |cross_site_transferring_request| is NULL if a request is not being
-  // transferred between renderers.
   void OnCrossSiteResponse(RenderFrameHostImpl* pending_render_frame_host,
                            const GlobalRequestID& global_request_id,
-                           std::unique_ptr<CrossSiteTransferringRequest>
-                               cross_site_transferring_request,
                            const std::vector<GURL>& transfer_url_chain,
                            const Referrer& referrer,
                            ui::PageTransition page_transition,
                            bool should_replace_current_entry);
 
   // Determines whether a navigation to |dest_url| may be completed using an
   // existing RenderFrameHost, or whether transferring to a new RenderFrameHost
   // backed by a different render process is required. This is a security policy
   // check determined by the current site isolation mode, and must be done
   // before the resource at |dest_url| is delivered to |existing_rfh|.
@@ skipping 451 matching lines @@
   // RenderFrame instance.
   // For now, RenderFrameHost keeps a RenderViewHost in its SiteInstance alive.
   // Eventually, RenderViewHost will be replaced with a page context.
   std::unique_ptr<RenderFrameHostImpl> render_frame_host_;
 
   // A RenderFrameHost used to load a cross-site page. This remains hidden
   // while a cross-site request is pending until it calls DidNavigate.
   // Note: This member is not used in PlzNavigate.
   std::unique_ptr<RenderFrameHostImpl> pending_render_frame_host_;
 
-  // If a pending request needs to be transferred to another process, this
-  // owns the request until it's transferred to the new process, so it will be
-  // cleaned up if the navigation is cancelled.  Otherwise, this is NULL.
-  std::unique_ptr<CrossSiteTransferringRequest>
-      cross_site_transferring_request_;
-
   // This is used to temporarily store the NavigationHandle during
   // transferring navigations. The handle needs to be stored because the old
   // RenderFrameHost may be discarded before a new RenderFrameHost is created
   // for the navigation.
   // PlzNavigate: this will never be set since there are no transferring
   // navigations in PlzNavigate.
   std::unique_ptr<NavigationHandleImpl> transfer_navigation_handle_;
 
   // Proxy hosts, indexed by site instance ID.
   std::unordered_map<int32_t, std::unique_ptr<RenderFrameProxyHost>>
@@ skipping 19 matching lines @@
   std::unique_ptr<RenderFrameHostImpl> speculative_render_frame_host_;
 
   base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_