Clean up RenderViewHostManager swapping logic.

content/browser/frame_host/render_view_host_manager_unittest.cc

 // 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.
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
 #include "content/browser/frame_host/render_view_host_manager.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 116 matching lines @@
 
     // Simulate the SwapOut_ACK that fires if you commit a cross-site
     // navigation.
     if (old_rvh != active_rvh())
       old_rvh->OnSwappedOut(false);
 
     active_test_rvh()->SendNavigate(max_page_id + 1, url);
   }
 
   bool ShouldSwapProcesses(RenderViewHostManager* manager,
-                           const NavigationEntryImpl* cur_entry,
+                           const NavigationEntryImpl* current_entry,
                            const NavigationEntryImpl* new_entry) const {
-    return manager->ShouldSwapProcessesForNavigation(cur_entry, new_entry);
+    return manager->ShouldSwapBrowsingInstancesForNavigation(current_entry,
+                                                             new_entry);
   }
 
   // Creates a test RenderViewHost that's swapped out.
   TestRenderViewHost* CreateSwappedOutRenderViewHost() {
     const GURL kChromeURL("chrome://foo");
     const GURL kDestUrl("http://www.google.com/");
 
     // Navigate our first tab to a chrome url and then to the destination.
     NavigateActiveAndCommit(kChromeURL);
     TestRenderViewHost* ntp_rvh = static_cast<TestRenderViewHost*>(
@@ skipping 1159 matching lines @@
                           Source<RenderWidgetHost>(host2));
   manager.ShouldClosePage(false, true, base::TimeTicks());
 
   EXPECT_TRUE(
       notifications.Check1AndReset(NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED));
   EXPECT_FALSE(manager.pending_render_view_host());
   EXPECT_EQ(host, manager.current_host());
 }
 
 }  // namespace content