Revert the merge of CrossSiteResourceHandler and NavigationResourceThrottle.

content/public/browser/content_browser_client.h

 // Copyright (c) 2012 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_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 260 matching lines @@
   // created (even if we are in a process model that doesn't usually swap.)
   // This forces a process swap and severs script connections with existing
   // tabs.
   virtual bool ShouldSwapBrowsingInstancesForNavigation(
       SiteInstance* site_instance,
       const GURL& current_url,
       const GURL& new_url);
 
   // Returns true if the given navigation redirect should cause a renderer
   // process swap.
-  virtual bool ShouldSwapProcessesForRedirect(BrowserContext* browser_context,
+  // This is called on the IO thread.
+  virtual bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context,
                                               const GURL& current_url,
                                               const GURL& new_url);
 
   // Returns true if the passed in URL should be assigned as the site of the
   // current SiteInstance, if it does not yet have a site.
   virtual bool ShouldAssignSiteForURL(const GURL& url);
 
   // See CharacterEncoding's comment.
   virtual std::string GetCanonicalEncodingNameByAliasName(
       const std::string& alias_name);
@@ skipping 498 matching lines @@
   // Returns whether the Win32k lockdown process mitigation should be applied to
   // a process hosting a plugin with the specified |mime_type|.
   virtual bool IsWin32kLockdownEnabledForMimeType(
       const std::string& mime_type) const;
 #endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_