Revert 139933 - Clean up RenderViewHostManager swapping logic.

content/public/browser/content_browser_client.cc

 // 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.
 
 #include "content/public/browser/content_browser_client.h"
 
 #include "base/file_path.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace content {
@@ skipping 35 matching lines @@
 bool ContentBrowserClient::IsSuitableHost(RenderProcessHost* process_host,
                                           const GURL& site_url) {
   return true;
 }
 
 bool ContentBrowserClient::ShouldTryToUseExistingProcessHost(
       BrowserContext* browser_context, const GURL& url) {
   return false;
 }
 
-bool ContentBrowserClient::ShouldSwapBrowsingInstanceForNavigation(
-      BrowserContext* browser_context,
-      const GURL& current_url,
-      const GURL& new_url) {
+bool ContentBrowserClient::ShouldSwapProcessesForNavigation(
+    const GURL& current_url,
+    const GURL& new_url) {
   return false;
 }
 
 bool ContentBrowserClient::ShouldSwapProcessesForRedirect(
     ResourceContext* resource_context, const GURL& current_url,
     const GURL& new_url) {
   return false;
 }
 
 std::string ContentBrowserClient::GetCanonicalEncodingNameByAliasName(
@@ skipping 147 matching lines @@
 #endif
 
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ContentBrowserClient::GetCryptoPasswordDelegate(const GURL& url) {
   return NULL;
 }
 #endif
 
 }  // namespace content