Clean up RenderViewHostManager swapping logic.

content/browser/web_contents/render_view_host_manager_unittest.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 "base/utf_string_conversions.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/navigation_entry_impl.h"
@@ skipping 144 matching lines @@
 
     // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation
     // without making any network requests.
     if (old_rvh != active_rvh())
       old_rvh->OnSwapOutACK(false);
   }
 
   bool ShouldSwapProcesses(RenderViewHostManager* manager,
                            const NavigationEntryImpl* cur_entry,
                            const NavigationEntryImpl* new_entry) const {
-    return manager->ShouldSwapProcessesForNavigation(cur_entry, new_entry);
+    return manager->ShouldSwapBrowsingInstanceForNavigation(cur_entry,
+                                                            new_entry);
   }
 
  private:
   RenderViewHostManagerTestClient client_;
   RenderViewHostManagerTestBrowserClient browser_client_;
   ContentClient* old_client_;
   ContentBrowserClient* old_browser_client_;
 };
 
 // Tests that when you navigate from a chrome:// url to another page, and
@@ skipping 746 matching lines @@
 
   // Commit.
   manager.DidNavigateMainFrame(host);
   EXPECT_EQ(host, manager.current_host());
   ASSERT_TRUE(host);
   EXPECT_EQ(static_cast<SiteInstanceImpl*>(host->GetSiteInstance()),
       instance);
 }
 
 }  // namespace content