Revert 139933 - 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 162 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();
   }
 
   bool ShouldSwapProcesses(RenderViewHostManager* manager,
                            const NavigationEntryImpl* cur_entry,
                            const NavigationEntryImpl* new_entry) const {
-    return manager->ShouldSwapBrowsingInstanceForNavigation(cur_entry,
-                                                            new_entry);
+    return manager->ShouldSwapProcessesForNavigation(cur_entry, new_entry);
   }
 
  private:
   RenderViewHostManagerTestClient client_;
   RenderViewHostManagerTestBrowserClient browser_client_;
   content::ContentClient* old_client_;
   content::ContentBrowserClient* old_browser_client_;
 };
 
 // Tests that when you navigate from the New TabPage to another page, and
@@ skipping 634 matching lines @@
   EXPECT_FALSE(rvh1->GetSiteInstance()->IsRelatedSiteInstance(
                    rvh3->GetSiteInstance()));
 
   // No scripting is allowed across BrowsingInstances, so we should not create
   // swapped out RVHs for the opener chain in this case.
   EXPECT_FALSE(opener1_manager->GetSwappedOutRenderViewHost(
                    rvh3->GetSiteInstance()));
   EXPECT_FALSE(opener2_manager->GetSwappedOutRenderViewHost(
                    rvh3->GetSiteInstance()));
 }