Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle.

content/shell/browser/shell_content_browser_client.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_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 38 matching lines @@
   WebContentsViewDelegate* GetWebContentsViewDelegate(
       WebContents* web_contents) override;
   QuotaPermissionContext* CreateQuotaPermissionContext() override;
   void SelectClientCertificate(
       WebContents* web_contents,
       net::SSLCertRequestInfo* cert_request_info,
       std::unique_ptr<ClientCertificateDelegate> delegate) override;
   SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate()
       override;
   net::NetLog* GetNetLog() override;
-  bool ShouldSwapProcessesForRedirect(BrowserContext* browser_context,
+  bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context,
                                       const GURL& current_url,
                                       const GURL& new_url) override;
   DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
 
   void OpenURL(BrowserContext* browser_context,
                const OpenURLParams& params,
                const base::Callback<void(WebContents*)>& callback) override;
 
 #if defined(OS_ANDROID)
   void GetAdditionalMappedFilesForChildProcess(
@@ skipping 41 matching lines @@
       resource_dispatcher_host_delegate_;
 
   base::Closure select_client_certificate_callback_;
 
   ShellBrowserMainParts* shell_browser_main_parts_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_