Revert 139933 - Clean up RenderViewHostManager swapping logic.

content/browser/web_contents/render_view_host_manager.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_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 217 matching lines @@
 
  private:
   friend class content::TestWebContents;
   friend class RenderViewHostManagerTest;
 
   // Returns whether this tab should transition to a new renderer for
   // cross-site URLs.  Enabled unless we see the --process-per-tab command line
   // switch.  Can be overridden in unit tests.
   bool ShouldTransitionCrossSite();
 
-  // Returns true if for the navigation from |current_entry| to |new_entry|,
-  // a new SiteInstance and BrowsingInstance should be 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.  Cases where this can
-  // happen include transitions between WebUI and regular web pages.
+  // Returns true if the two navigation entries are incompatible in some way
+  // other than site instances. Cases where this can happen include Web UI
+  // to regular web pages. It will cause us to swap RenderViewHosts (and hence
+  // RenderProcessHosts) even if the site instance would otherwise be the same.
+  // As part of this, we'll also force new SiteInstances and BrowsingInstances.
   // Either of the entries may be NULL.
-  bool ShouldSwapBrowsingInstanceForNavigation(
-      const content::NavigationEntry* current_entry,
+  bool ShouldSwapProcessesForNavigation(
+      const content::NavigationEntry* curr_entry,
       const content::NavigationEntryImpl* new_entry) const;
 
-  // Returns true if it is safe to reuse the current WebUI when navigating from
-  // |curr_entry| to |new_entry|.
   bool ShouldReuseWebUI(
       const content::NavigationEntry* curr_entry,
       const content::NavigationEntryImpl* new_entry) const;
 
   // Returns an appropriate SiteInstance object for the given NavigationEntry,
-  // possibly reusing the current SiteInstance.  If --process-per-tab is used,
-  // this is only called when ShouldSwapBrowsingInstancesForNavigation returns
-  // true.
+  // possibly reusing the current SiteInstance.
+  // Never called if --process-per-tab is used.
   content::SiteInstance* GetSiteInstanceForEntry(
       const content::NavigationEntryImpl& entry,
-      content::SiteInstance* curr_instance,
-      bool force_swap);
+      content::SiteInstance* curr_instance);
 
   // Sets up the necessary state for a new RenderViewHost with the given opener.
   bool InitRenderView(content::RenderViewHost* render_view_host,
                       int opener_route_id);
 
   // Sets the pending RenderViewHost/WebUI to be the active one. Note that this
   // doesn't require the pending render_view_host_ pointer to be non-NULL, since
   // there could be Web UI switching as well. Call this for every commit.
   void CommitPending();
 
@@ skipping 52 matching lines @@
   // The intersitial page currently shown if any, not own by this class
   // (the InterstitialPage is self-owned, it deletes itself when hidden).
   InterstitialPageImpl* interstitial_page_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
 };
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_