Rename RenderViewHostManager to RenderFrameHostManager.

BUG=314791
TEST=No behavior change.
TBR=nduca@chromium.org

Review URL: https://codereview.chromium.org/92153003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237714 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 182 insertions, 183 deletions

diff --git a/build/android/pylib/gtest/filter/content_browsertests_disabled b/build/android/pylib/gtest/filter/content_browsertests_disabled
index 7fbc3ca..4fd7880 100644
--- a/build/android/pylib/gtest/filter/content_browsertests_disabled
+++ b/build/android/pylib/gtest/filter/content_browsertests_disabled
@@ -53,7 +53,7 @@ PasswordFormConversionUtilsTest.ValidWebFormElementToPasswordForm
 PasswordFormConversionUtilsTest.InvalidWebFormElementToPasswordForm
 
 # Multiple test servers support: http://crbug/187570
-RenderViewHostManagerTest.*
+RenderFrameHostManagerTest.*
 
 # http://crbug.com/215894
 DownloadContentTest.CancelInterruptedDownload
diff --git a/chrome/test/data/reliability/known_crashes.txt b/chrome/test/data/reliability/known_crashes.txt
index cc0970f6..c2c62eb 100644
--- a/chrome/test/data/reliability/known_crashes.txt
+++ b/chrome/test/data/reliability/known_crashes.txt
@@ -54,7 +54,7 @@ PREFIX : messageloop::posttask_helper___messageloop::posttask___disk_cache::infl
 PREFIX : anonymous namespace'::cachecreator::docallback___`anonymous namespace'::cachecreator::oniocomplete___disk_cache::inflightbackendio::onoperationcomplete___disk_cache::inflightio::invokecallback___disk_cache::backgroundio::oniosignalled___messageloop::runtask___messageloop::dowork___base::messagepumpforio::dorunloop___base::messagepumpwin::run___messageloop::runinternal___messageloop::run___base::thread::run___base::thread::threadmain___`anonymous namespace'::threadfunc
 
 # 49409
-PREFIX : std::basic_string<char,std::char_traits<char>,std::allocator<char> >::assign___fieldtriallist::statestostring___browserrenderprocesshost::appendrenderercommandline___browserrenderprocesshost::init___renderviewhost::createrenderview___tabcontents::createrenderviewforrendermanager___renderviewhostmanager::initrenderview___renderviewhostmanager::creatependingrenderview___renderviewhostmanager::updaterendererstatefornavigate___renderviewhostmanager::navigate___tabcontents::navigatetopendingentry___navigationcontroller::navigatetopendingentry___navigationcontroller::loadentry___navigationcontroller::loadurl___browser::openurlatindex___browser::openurlfromtab___browser::openurl___automationprovider::navigatetourlblockuntilnavigationscomplete___automationprovider::navigatetourl___ipc
+PREFIX : std::basic_string<char,std::char_traits<char>,std::allocator<char> >::assign___fieldtriallist::statestostring___browserrenderprocesshost::appendrenderercommandline___browserrenderprocesshost::init___renderviewhost::createrenderview___tabcontents::createrenderviewforrendermanager___renderframehostmanager::initrenderview___renderframehostmanager::creatependingrenderview___renderframehostmanager::updaterendererstatefornavigate___renderframehostmanager::navigate___tabcontents::navigatetopendingentry___navigationcontroller::navigatetopendingentry___navigationcontroller::loadentry___navigationcontroller::loadurl___browser::openurlatindex___browser::openurlfromtab___browser::openurl___automationprovider::navigatetourlblockuntilnavigationscomplete___automationprovider::navigatetourl___ipc
 
 # 39356
 PREFIX : renderwidgethost::onmsgupdaterect___ipc::messagewithtuple<tuple1<viewhostmsg_updaterect_params> >::dispatch<renderwidgethost,void (__thiscall renderwidgethost::*)(viewhostmsg_updaterect_params const &)>___renderwidgethost::onmessagereceived___renderviewhost::onmessagereceived___browserrenderprocesshost::onmessagereceived___renderwidgethelper::updatemsgproxy::run___messageloop::runtask___messageloop::dowork___base::messagepumpforui::dorunloop___base::messagepumpwin::runwithdispatcher___messageloop::runinternal___messageloopforui::run___`anonymous namespace'::runuimessageloop___browsermain___chromemain___maindllloader::launch___wwinmain_____tmaincrtstartup
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc
index 56c4b24..7d166a6 100644
--- a/content/browser/browser_plugin/browser_plugin_guest.cc
+++ b/content/browser/browser_plugin/browser_plugin_guest.cc
@@ -1170,7 +1170,7 @@ void BrowserPluginGuest::Attach(
   params.src.clear();
 
   // If a RenderView has already been created for this new window, then we need
-  // to initialize the browser-side state now so that the RenderViewHostManager
+  // to initialize the browser-side state now so that the RenderFrameHostManager
   // does not create a new RenderView on navigation.
   if (has_render_view_) {
     static_cast<RenderViewHostImpl*>(
diff --git a/content/browser/frame_host/DEPS b/content/browser/frame_host/DEPS
index 85fb015..09569cb 100644
--- a/content/browser/frame_host/DEPS
+++ b/content/browser/frame_host/DEPS
@@ -10,6 +10,7 @@ include_rules = [
 specific_include_rules = {
   ".*_(unit|browser)test\.cc": [
     "+content/browser/web_contents",
+    "+content/public/browser/web_contents.h",
     "+content/public/browser/web_contents_delegate.h",
   ],
   ".*interstitial_page_impl\.cc": [
diff --git a/content/browser/frame_host/frame_tree.cc b/content/browser/frame_host/frame_tree.cc
index 92818c874..303c496 100644
--- a/content/browser/frame_host/frame_tree.cc
+++ b/content/browser/frame_host/frame_tree.cc
@@ -46,7 +46,7 @@ bool FrameTreeNodeForFrameId(int64 frame_id,
 FrameTree::FrameTree(Navigator* navigator,
                      RenderViewHostDelegate* render_view_delegate,
                      RenderWidgetHostDelegate* render_widget_delegate,
-                     RenderViewHostManager::Delegate* manager_delegate)
+                     RenderFrameHostManager::Delegate* manager_delegate)
     : render_view_delegate_(render_view_delegate),
       render_widget_delegate_(render_widget_delegate),
       manager_delegate_(manager_delegate),
diff --git a/content/browser/frame_host/frame_tree.h b/content/browser/frame_host/frame_tree.h
index 4a1d841..498dc20 100644
--- a/content/browser/frame_host/frame_tree.h
+++ b/content/browser/frame_host/frame_tree.h
@@ -19,7 +19,7 @@ class Navigator;
 class RenderProcessHost;
 class RenderViewHostDelegate;
 class RenderViewHostImpl;
-class RenderViewHostManager;
+class RenderFrameHostManager;
 class RenderWidgetHostDelegate;
 
 // Represents the frame tree for a page. With the exception of the main frame,
@@ -42,13 +42,13 @@ class CONTENT_EXPORT FrameTree {
   // Each FrameTreeNode will default to using the given |navigator| for
   // navigation tasks in the frame.
   // A set of delegates are remembered here so that we can create
-  // RenderViewHostManagers.
+  // RenderFrameHostManagers.
   // TODO(creis): This set of delegates will change as we move things to
   // Navigator.
   FrameTree(Navigator* navigator,
             RenderViewHostDelegate* render_view_delegate,
             RenderWidgetHostDelegate* render_widget_delegate,
-            RenderViewHostManager::Delegate* manager_delegate);
+            RenderFrameHostManager::Delegate* manager_delegate);
   ~FrameTree();
 
   // Returns the FrameTreeNode with the given |frame_tree_node_id|.
@@ -120,7 +120,7 @@ class CONTENT_EXPORT FrameTree {
   // RenderFrameHosts that we create.
   RenderViewHostDelegate* render_view_delegate_;
   RenderWidgetHostDelegate* render_widget_delegate_;
-  RenderViewHostManager::Delegate* manager_delegate_;
+  RenderFrameHostManager::Delegate* manager_delegate_;
 
   scoped_ptr<FrameTreeNode> root_;
 
diff --git a/content/browser/frame_host/frame_tree_node.cc b/content/browser/frame_host/frame_tree_node.cc
index 0d77618..65c20ee 100644
--- a/content/browser/frame_host/frame_tree_node.cc
+++ b/content/browser/frame_host/frame_tree_node.cc
@@ -18,7 +18,7 @@ int64 FrameTreeNode::next_frame_tree_node_id_ = 1;
 FrameTreeNode::FrameTreeNode(Navigator* navigator,
                              RenderViewHostDelegate* render_view_delegate,
                              RenderWidgetHostDelegate* render_widget_delegate,
-                             RenderViewHostManager::Delegate* manager_delegate,
+                             RenderFrameHostManager::Delegate* manager_delegate,
                              int64 frame_id,
                              const std::string& name,
                              scoped_ptr<RenderFrameHostImpl> render_frame_host)
diff --git a/content/browser/frame_host/frame_tree_node.h b/content/browser/frame_host/frame_tree_node.h
index a110ff9..cc8e9fa 100644
--- a/content/browser/frame_host/frame_tree_node.h
+++ b/content/browser/frame_host/frame_tree_node.h
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "content/browser/frame_host/render_view_host_manager.h"
+#include "content/browser/frame_host/render_frame_host_manager.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
@@ -31,7 +31,7 @@ class CONTENT_EXPORT FrameTreeNode {
   FrameTreeNode(Navigator* navigator,
                 RenderViewHostDelegate* render_view_delegate,
                 RenderWidgetHostDelegate* render_widget_delegate,
-                RenderViewHostManager::Delegate* manager_delegate,
+                RenderFrameHostManager::Delegate* manager_delegate,
                 int64 frame_id,
                 const std::string& name,
                 scoped_ptr<RenderFrameHostImpl> render_frame_host);
@@ -55,7 +55,7 @@ class CONTENT_EXPORT FrameTreeNode {
     return navigator_.get();
   }
 
-  RenderViewHostManager* render_manager() {
+  RenderFrameHostManager* render_manager() {
     return &render_manager_;
   }
 
@@ -109,9 +109,8 @@ class CONTENT_EXPORT FrameTreeNode {
   // be declared before |children_| so that it gets deleted after them.  That's
   // currently necessary so that RenderFrameHostImpl's destructor can call
   // GetProcess.
-  // TODO(creis): This will become a RenderFrameHostManager, which eliminates
-  // the need for |render_frame_host_| below.
-  RenderViewHostManager render_manager_;
+  // TODO(creis): This will eliminate the need for |render_frame_host_| below.
+  RenderFrameHostManager render_manager_;
 
   // A browser-global identifier for the frame in the page, which stays stable
   // even if the frame does a cross-process navigation.
@@ -134,7 +133,7 @@ class CONTENT_EXPORT FrameTreeNode {
   // |render_frame_host_| below is not deleted on destruction.
   //
   // For the mainframe, the FrameTree does not own the |render_frame_host_|.
-  // This is a transitional wart because RenderViewHostManager does not yet
+  // This is a transitional wart because RenderFrameHostManager does not yet
   // have the bookkeeping logic to handle creating a pending RenderFrameHost
   // along with a pending RenderViewHost. Thus, for the main frame, the
   // RenderViewHost currently retains ownership and the FrameTreeNode should
diff --git a/content/browser/frame_host/render_view_host_manager.cc b/content/browser/frame_host/render_frame_host_manager.cc
index e46124b..4e64342 100644
--- a/content/browser/frame_host/render_view_host_manager.cc
+++ b/content/browser/frame_host/render_frame_host_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/frame_host/render_view_host_manager.h"
+#include "content/browser/frame_host/render_frame_host_manager.h"
 
 #include <utility>
 
@@ -33,11 +33,11 @@
 
 namespace content {
 
-RenderViewHostManager::PendingNavigationParams::PendingNavigationParams()
+RenderFrameHostManager::PendingNavigationParams::PendingNavigationParams()
     : is_transfer(false), frame_id(-1), should_replace_current_entry(false) {
 }
 
-RenderViewHostManager::PendingNavigationParams::PendingNavigationParams(
+RenderFrameHostManager::PendingNavigationParams::PendingNavigationParams(
     const GlobalRequestID& global_request_id,
     bool is_transfer,
     const std::vector<GURL>& transfer_url_chain,
@@ -54,9 +54,9 @@ RenderViewHostManager::PendingNavigationParams::PendingNavigationParams(
       should_replace_current_entry(should_replace_current_entry) {
 }
 
-RenderViewHostManager::PendingNavigationParams::~PendingNavigationParams() {}
+RenderFrameHostManager::PendingNavigationParams::~PendingNavigationParams() {}
 
-RenderViewHostManager::RenderViewHostManager(
+RenderFrameHostManager::RenderFrameHostManager(
     RenderViewHostDelegate* render_view_delegate,
     RenderWidgetHostDelegate* render_widget_delegate,
     Delegate* delegate)
@@ -69,7 +69,7 @@ RenderViewHostManager::RenderViewHostManager(
       interstitial_page_(NULL) {
 }
 
-RenderViewHostManager::~RenderViewHostManager() {
+RenderFrameHostManager::~RenderFrameHostManager() {
   if (pending_render_view_host_)
     CancelPending();
 
@@ -87,10 +87,10 @@ RenderViewHostManager::~RenderViewHostManager() {
   }
 }
 
-void RenderViewHostManager::Init(BrowserContext* browser_context,
-                                 SiteInstance* site_instance,
-                                 int routing_id,
-                                 int main_frame_routing_id) {
+void RenderFrameHostManager::Init(BrowserContext* browser_context,
+                                  SiteInstance* site_instance,
+                                  int routing_id,
+                                  int main_frame_routing_id) {
   // Create a RenderViewHost, once we have an instance.  It is important to
   // immediately give this SiteInstance to a RenderViewHost so that it is
   // ref counted.
@@ -111,15 +111,15 @@ void RenderViewHostManager::Init(BrowserContext* browser_context,
                  NotificationService::AllSources());
 }
 
-RenderViewHostImpl* RenderViewHostManager::current_host() const {
+RenderViewHostImpl* RenderFrameHostManager::current_host() const {
   return render_view_host_;
 }
 
-RenderViewHostImpl* RenderViewHostManager::pending_render_view_host() const {
+RenderViewHostImpl* RenderFrameHostManager::pending_render_view_host() const {
   return pending_render_view_host_;
 }
 
-RenderWidgetHostView* RenderViewHostManager::GetRenderWidgetHostView() const {
+RenderWidgetHostView* RenderFrameHostManager::GetRenderWidgetHostView() const {
   if (interstitial_page_)
     return interstitial_page_->GetView();
   if (!render_view_host_)
@@ -127,7 +127,7 @@ RenderWidgetHostView* RenderViewHostManager::GetRenderWidgetHostView() const {
   return render_view_host_->GetView();
 }
 
-void RenderViewHostManager::SetPendingWebUI(const NavigationEntryImpl& entry) {
+void RenderFrameHostManager::SetPendingWebUI(const NavigationEntryImpl& entry) {
   pending_web_ui_.reset(
       delegate_->CreateWebUIForRenderManager(entry.GetURL()));
   pending_and_current_web_ui_.reset();
@@ -144,9 +144,9 @@ void RenderViewHostManager::SetPendingWebUI(const NavigationEntryImpl& entry) {
   }
 }
 
-RenderViewHostImpl* RenderViewHostManager::Navigate(
+RenderViewHostImpl* RenderFrameHostManager::Navigate(
     const NavigationEntryImpl& entry) {
-  TRACE_EVENT0("browser", "RenderViewHostManager:Navigate");
+  TRACE_EVENT0("browser", "RenderFrameHostManager:Navigate");
   // Create a pending RenderViewHost. It will give us the one we should use
   RenderViewHostImpl* dest_render_view_host =
       static_cast<RenderViewHostImpl*>(UpdateRendererStateForNavigate(entry));
@@ -189,7 +189,7 @@ RenderViewHostImpl* RenderViewHostManager::Navigate(
   return dest_render_view_host;
 }
 
-void RenderViewHostManager::Stop() {
+void RenderFrameHostManager::Stop() {
   render_view_host_->Stop();
 
   // If we are cross-navigating, we should stop the pending renderers.  This
@@ -200,13 +200,13 @@ void RenderViewHostManager::Stop() {
   }
 }
 
-void RenderViewHostManager::SetIsLoading(bool is_loading) {
+void RenderFrameHostManager::SetIsLoading(bool is_loading) {
   render_view_host_->SetIsLoading(is_loading);
   if (pending_render_view_host_)
     pending_render_view_host_->SetIsLoading(is_loading);
 }
 
-bool RenderViewHostManager::ShouldCloseTabOnUnresponsiveRenderer() {
+bool RenderFrameHostManager::ShouldCloseTabOnUnresponsiveRenderer() {
   if (!cross_navigation_pending_)
     return true;
 
@@ -238,7 +238,7 @@ bool RenderViewHostManager::ShouldCloseTabOnUnresponsiveRenderer() {
   return false;
 }
 
-void RenderViewHostManager::SwappedOut(RenderViewHost* render_view_host) {
+void RenderFrameHostManager::SwappedOut(RenderViewHost* render_view_host) {
   // Make sure this is from our current RVH, and that we have a pending
   // navigation from OnCrossSiteResponse.  (There may be no pending navigation
   // for data URLs that don't make network requests, for example.)   If not,
@@ -283,7 +283,7 @@ void RenderViewHostManager::SwappedOut(RenderViewHost* render_view_host) {
   pending_nav_params_.reset();
 }
 
-void RenderViewHostManager::DidNavigateMainFrame(
+void RenderFrameHostManager::DidNavigateMainFrame(
     RenderViewHost* render_view_host) {
   if (!cross_navigation_pending_) {
     DCHECK(!pending_render_view_host_);
@@ -318,7 +318,7 @@ void RenderViewHostManager::DidNavigateMainFrame(
   }
 }
 
-void RenderViewHostManager::DidDisownOpener(RenderViewHost* render_view_host) {
+void RenderFrameHostManager::DidDisownOpener(RenderViewHost* render_view_host) {
   // Notify all swapped out hosts, including the pending RVH.
   for (RenderViewHostMap::iterator iter = swapped_out_hosts_.begin();
        iter != swapped_out_hosts_.end();
@@ -329,7 +329,7 @@ void RenderViewHostManager::DidDisownOpener(RenderViewHost* render_view_host) {
   }
 }
 
-void RenderViewHostManager::RendererAbortedProvisionalLoad(
+void RenderFrameHostManager::RendererAbortedProvisionalLoad(
     RenderViewHost* render_view_host) {
   // We used to cancel the pending renderer here for cross-site downloads.
   // However, it's not safe to do that because the download logic repeatedly
@@ -343,7 +343,7 @@ void RenderViewHostManager::RendererAbortedProvisionalLoad(
   // the response is not a download.
 }
 
-void RenderViewHostManager::RendererProcessClosing(
+void RenderFrameHostManager::RendererProcessClosing(
     RenderProcessHost* render_process_host) {
   // Remove any swapped out RVHs from this process, so that we don't try to
   // swap them back in while the process is exiting.  Start by finding them,
@@ -364,7 +364,7 @@ void RenderViewHostManager::RendererProcessClosing(
   }
 }
 
-void RenderViewHostManager::ShouldClosePage(
+void RenderFrameHostManager::ShouldClosePage(
     bool for_cross_site_transition,
     bool proceed,
     const base::TimeTicks& proceed_time) {
@@ -409,7 +409,7 @@ void RenderViewHostManager::ShouldClosePage(
   }
 }
 
-void RenderViewHostManager::OnCrossSiteResponse(
+void RenderFrameHostManager::OnCrossSiteResponse(
     RenderViewHost* pending_render_view_host,
     const GlobalRequestID& global_request_id,
     bool is_transfer,
@@ -437,7 +437,7 @@ void RenderViewHostManager::OnCrossSiteResponse(
   SwapOutOldPage();
 }
 
-void RenderViewHostManager::SwapOutOldPage() {
+void RenderFrameHostManager::SwapOutOldPage() {
   // Should only see this while we have a pending renderer or transfer.
   CHECK(cross_navigation_pending_ || pending_nav_params_.get());
 
@@ -466,7 +466,7 @@ void RenderViewHostManager::SwapOutOldPage() {
     pending_render_view_host_->SetHasPendingCrossSiteRequest(false);
 }
 
-void RenderViewHostManager::Observe(
+void RenderFrameHostManager::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
@@ -482,7 +482,7 @@ void RenderViewHostManager::Observe(
   }
 }
 
-bool RenderViewHostManager::ShouldTransitionCrossSite() {
+bool RenderFrameHostManager::ShouldTransitionCrossSite() {
   // False in the single-process mode, as it makes RVHs to accumulate
   // in swapped_out_hosts_.
   // True if we are using process-per-site-instance (default) or
@@ -492,7 +492,7 @@ bool RenderViewHostManager::ShouldTransitionCrossSite() {
       !CommandLine::ForCurrentProcess()->HasSwitch(switches::kProcessPerTab);
 }
 
-bool RenderViewHostManager::ShouldSwapBrowsingInstancesForNavigation(
+bool RenderFrameHostManager::ShouldSwapBrowsingInstancesForNavigation(
     const NavigationEntry* current_entry,
     const NavigationEntryImpl* new_entry) const {
   DCHECK(new_entry);
@@ -554,7 +554,7 @@ bool RenderViewHostManager::ShouldSwapBrowsingInstancesForNavigation(
   return false;
 }
 
-bool RenderViewHostManager::ShouldReuseWebUI(
+bool RenderFrameHostManager::ShouldReuseWebUI(
     const NavigationEntry* current_entry,
     const NavigationEntryImpl* new_entry) const {
   NavigationControllerImpl& controller =
@@ -566,7 +566,7 @@ bool RenderViewHostManager::ShouldReuseWebUI(
           controller.GetBrowserContext(), new_entry->GetURL()));
 }
 
-SiteInstance* RenderViewHostManager::GetSiteInstanceForEntry(
+SiteInstance* RenderFrameHostManager::GetSiteInstanceForEntry(
     const NavigationEntryImpl& entry,
     SiteInstance* current_instance,
     bool force_browsing_instance_swap) {
@@ -719,7 +719,7 @@ SiteInstance* RenderViewHostManager::GetSiteInstanceForEntry(
   return current_instance->GetRelatedSiteInstance(dest_url);
 }
 
-int RenderViewHostManager::CreateRenderView(
+int RenderFrameHostManager::CreateRenderView(
     SiteInstance* instance,
     int opener_route_id,
     bool swapped_out,
@@ -775,8 +775,8 @@ int RenderViewHostManager::CreateRenderView(
   return new_render_view_host->GetRoutingID();
 }
 
-bool RenderViewHostManager::InitRenderView(RenderViewHost* render_view_host,
-                                           int opener_route_id) {
+bool RenderFrameHostManager::InitRenderView(RenderViewHost* render_view_host,
+                                            int opener_route_id) {
   // If the pending navigation is to a WebUI and the RenderView is not in a
   // guest process, tell the RenderView about any bindings it will need enabled.
   if (pending_web_ui() && !render_view_host->GetProcess()->IsGuest()) {
@@ -792,7 +792,7 @@ bool RenderViewHostManager::InitRenderView(RenderViewHost* render_view_host,
                                                      opener_route_id);
 }
 
-void RenderViewHostManager::CommitPending() {
+void RenderFrameHostManager::CommitPending() {
   // First check whether we're going to want to focus the location bar after
   // this commit.  We do this now because the navigation hasn't formally
   // committed yet, so if we've already cleared |pending_web_ui_| the call chain
@@ -897,7 +897,7 @@ void RenderViewHostManager::CommitPending() {
   }
 }
 
-void RenderViewHostManager::ShutdownRenderViewHostsInSiteInstance(
+void RenderFrameHostManager::ShutdownRenderViewHostsInSiteInstance(
     int32 site_instance_id) {
   // First remove any swapped out RVH for this SiteInstance from our
   // list.
@@ -915,7 +915,7 @@ void RenderViewHostManager::ShutdownRenderViewHostsInSiteInstance(
   }
 }
 
-RenderViewHostImpl* RenderViewHostManager::UpdateRendererStateForNavigate(
+RenderViewHostImpl* RenderFrameHostManager::UpdateRendererStateForNavigate(
     const NavigationEntryImpl& entry) {
   // If we are currently navigating cross-process, we want to get back to normal
   // and then navigate as usual.
@@ -1067,7 +1067,7 @@ RenderViewHostImpl* RenderViewHostManager::UpdateRendererStateForNavigate(
   return render_view_host_;
 }
 
-void RenderViewHostManager::CancelPending() {
+void RenderFrameHostManager::CancelPending() {
   RenderViewHostImpl* pending_render_view_host = pending_render_view_host_;
   pending_render_view_host_ = NULL;
 
@@ -1096,7 +1096,7 @@ void RenderViewHostManager::CancelPending() {
   pending_and_current_web_ui_.reset();
 }
 
-void RenderViewHostManager::RenderViewDeleted(RenderViewHost* rvh) {
+void RenderFrameHostManager::RenderViewDeleted(RenderViewHost* rvh) {
   // We are doing this in order to work around and to track a crasher
   // (http://crbug.com/23411) where it seems that pending_render_view_host_ is
   // deleted (not sure from where) but not NULLed.
@@ -1124,7 +1124,7 @@ void RenderViewHostManager::RenderViewDeleted(RenderViewHost* rvh) {
   }
 }
 
-bool RenderViewHostManager::IsOnSwappedOutList(RenderViewHost* rvh) const {
+bool RenderFrameHostManager::IsOnSwappedOutList(RenderViewHost* rvh) const {
   if (!rvh->GetSiteInstance())
     return false;
 
@@ -1136,7 +1136,7 @@ bool RenderViewHostManager::IsOnSwappedOutList(RenderViewHost* rvh) const {
   return iter->second == rvh;
 }
 
-RenderViewHostImpl* RenderViewHostManager::GetSwappedOutRenderViewHost(
+RenderViewHostImpl* RenderFrameHostManager::GetSwappedOutRenderViewHost(
     SiteInstance* instance) {
   RenderViewHostMap::iterator iter = swapped_out_hosts_.find(instance->GetId());
   if (iter != swapped_out_hosts_.end())
diff --git a/content/browser/frame_host/render_view_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
index 8809589..78ca04a 100644
--- a/content/browser/frame_host/render_view_host_manager.h
+++ b/content/browser/frame_host/render_frame_host_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_VIEW_HOST_MANAGER_H_
-#define CONTENT_BROWSER_FRAME_HOST_RENDER_VIEW_HOST_MANAGER_H_
+#ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
+#define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ -23,18 +23,17 @@ class InterstitialPageImpl;
 class NavigationControllerImpl;
 class NavigationEntry;
 class NavigationEntryImpl;
+class RenderFrameHostManagerTest;
 class RenderViewHost;
 class RenderViewHostImpl;
-class RenderViewHostManagerTest;
 class RenderWidgetHostDelegate;
 class RenderWidgetHostView;
 class TestWebContents;
 class WebUIImpl;
 
-// Manages RenderViewHosts for a WebContentsImpl. Normally there is only one and
-// it is easy to do. But we can also have transitions of processes (and hence
-// RenderViewHosts) that can get complex.
-class CONTENT_EXPORT RenderViewHostManager
+// Manages RenderFrameHosts for a FrameTreeNode.  This class acts as a state
+// machine to make cross-process navigations in a frame possible.
+class CONTENT_EXPORT RenderFrameHostManager
     : public RenderViewHostDelegate::RendererManagement,
       public NotificationObserver {
  public:
@@ -113,11 +112,11 @@ class CONTENT_EXPORT RenderViewHostManager
   // RenderViewHosts that are created.
   //
   // You must call Init() before using this class.
-  RenderViewHostManager(
+  RenderFrameHostManager(
       RenderViewHostDelegate* render_view_delegate,
       RenderWidgetHostDelegate* render_widget_delegate,
       Delegate* delegate);
-  virtual ~RenderViewHostManager();
+  virtual ~RenderFrameHostManager();
 
   // For arguments, see WebContentsImpl constructor.
   void Init(BrowserContext* browser_context,
@@ -248,7 +247,7 @@ class CONTENT_EXPORT RenderViewHostManager
   void SwapOutOldPage();
 
  private:
-  friend class RenderViewHostManagerTest;
+  friend class RenderFrameHostManagerTest;
   friend class TestWebContents;
 
   // Tracks information about a navigation while a cross-process transition is
@@ -399,9 +398,9 @@ class CONTENT_EXPORT RenderViewHostManager
 
   NotificationRegistrar registrar_;
 
-  DISALLOW_COPY_AND_ASSIGN(RenderViewHostManager);
+  DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_VIEW_HOST_MANAGER_H_
+#endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_MANAGER_H_
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
index 24014ed..0a00e9f 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_browsertest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -34,9 +34,9 @@
 
 namespace content {
 
-class RenderViewHostManagerTest : public ContentBrowserTest {
+class RenderFrameHostManagerTest : public ContentBrowserTest {
  public:
-  RenderViewHostManagerTest() {}
+  RenderFrameHostManagerTest() {}
 
   static bool GetFilePathWithHostAndPortReplacement(
       const std::string& original_file_path,
@@ -51,7 +51,7 @@ class RenderViewHostManagerTest : public ContentBrowserTest {
 };
 
 // Web pages should not have script access to the swapped out page.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        DISABLED_NoScriptAccessAfterSwapOut) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -119,7 +119,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
 // Test for crbug.com/24447.  Following a cross-site link with rel=noreferrer
 // and target=_blank should create a new SiteInstance.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        SwapProcessWithRelNoreferrerAndTargetBlank) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -173,7 +173,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 // As of crbug.com/69267, we create a new BrowsingInstance (and SiteInstance)
 // for rel=noreferrer links in new windows, even to same site pages and named
 // targets.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        SwapProcessWithSameSiteRelNoreferrer) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -227,7 +227,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
 // Test for crbug.com/24447.  Following a cross-site link with just
 // target=_blank should not create a new SiteInstance.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        DontSwapProcessWithOnlyTargetBlank) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -275,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
 // Test for crbug.com/24447.  Following a cross-site link with rel=noreferrer
 // and no target=_blank should not create a new SiteInstance.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        DontSwapProcessWithOnlyRelNoreferrer) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -322,7 +322,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
 // Test for crbug.com/116192.  Targeted links should still work after the
 // named target window has swapped processes.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        AllowTargetedNavigationsAfterSwap) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -407,7 +407,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 #else
 #define MAYBE_DisownOpener DisownOpener
 #endif
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, MAYBE_DisownOpener) {
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, MAYBE_DisownOpener) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
   net::SpawnedTestServer https_server(
@@ -483,7 +483,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, MAYBE_DisownOpener) {
 }
 
 // Test that subframes can disown their openers.  http://crbug.com/225528.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownSubframeOpener) {
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, DisownSubframeOpener) {
   const GURL frame_url("data:text/html,<iframe name=\"foo\"></iframe>");
   NavigateToURL(shell(), frame_url);
 
@@ -505,7 +505,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, DisownSubframeOpener) {
 // 4) Post a message from _blank to "foo".
 // 5) Post a message from "foo" to a subframe of opener, which replies back.
 // 6) Post a message from _blank to a subframe of "foo".
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        SupportCrossProcessPostMessage) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -528,7 +528,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   scoped_refptr<SiteInstance> orig_site_instance(
       opener_contents->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance.get() != NULL);
-  RenderViewHostManager* opener_manager = static_cast<WebContentsImpl*>(
+  RenderFrameHostManager* opener_manager = static_cast<WebContentsImpl*>(
       opener_contents)->GetRenderManagerForTesting();
 
   // 1) Open two more windows, one named.  These initially have openers but no
@@ -571,7 +571,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   EXPECT_EQ("/files/title2.html", new_contents->GetLastCommittedURL().path());
   NavigateToURL(new_shell2, test_server()->GetURL("files/post_message.html"));
   EXPECT_EQ(orig_site_instance, new_contents->GetSiteInstance());
-  RenderViewHostManager* new_manager =
+  RenderFrameHostManager* new_manager =
       static_cast<WebContentsImpl*>(new_contents)->GetRenderManagerForTesting();
 
   // We now have three windows.  The opener should have a swapped out RVH
@@ -652,7 +652,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 // 2) Post a message containing a message port from opener to "foo".
 // 3) Post a message from "foo" back to opener via the passed message port.
 // The test will be enabled when the feature implementation lands.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        SupportCrossProcessPostMessageWithMessagePort) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -675,7 +675,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
   scoped_refptr<SiteInstance> orig_site_instance(
       opener_contents->GetSiteInstance());
   EXPECT_TRUE(orig_site_instance.get() != NULL);
-  RenderViewHostManager* opener_manager = static_cast<WebContentsImpl*>(
+  RenderFrameHostManager* opener_manager = static_cast<WebContentsImpl*>(
       opener_contents)->GetRenderManagerForTesting();
 
   // 1) Open a named target=foo window. We will later post a message between the
@@ -748,7 +748,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
 // Test for crbug.com/116192.  Navigations to a window's opener should
 // still work after a process swap.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        AllowTargetedNavigationsInOpenerAfterSwap) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -816,7 +816,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 // Test that opening a new window in the same SiteInstance and then navigating
 // both windows to a different SiteInstance allows the first process to exit.
 // See http://crbug.com/126333.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        ProcessExitWithSwappedOutViews) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -884,7 +884,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 
 // Test for crbug.com/76666.  A cross-site navigation that fails with a 204
 // error should not make us ignore future renderer-initiated navigations.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, ClickLinkAfter204Error) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
   net::SpawnedTestServer https_server(
@@ -948,7 +948,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
 // initiated navigation in a new tab, until the content of the initial
 // about:blank page is modified by another window.  At that point, we should
 // revert to showing about:blank to prevent a URL spoof.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShowLoadingURLUntilSpoof) {
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, ShowLoadingURLUntilSpoof) {
   ASSERT_TRUE(test_server()->Start());
 
   // Load a page that can open a URL that won't commit in a new window.
@@ -997,7 +997,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ShowLoadingURLUntilSpoof) {
 // initiated navigation in a new tab if it is not the initial navigation.  In
 // this case, the renderer will not notify us of a modification, so we cannot
 // show the pending URL without allowing a spoof.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        DontShowLoadingURLIfNotInitialNav) {
   ASSERT_TRUE(test_server()->Start());
 
@@ -1031,7 +1031,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
 // Test for http://crbug.com/93427.  Ensure that cross-site navigations
 // do not cause back/forward navigations to be considered stale by the
 // renderer.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, BackForwardNotStale) {
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, BackForwardNotStale) {
   NavigateToURL(shell(), GURL(kAboutBlankURL));
 
   // Start two servers with different sites.
@@ -1129,7 +1129,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, BackForwardNotStale) {
 
 // Test for http://crbug.com/130016.
 // Swapping out a render view should update its visiblity state.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        SwappedOutViewHasCorrectVisibilityState) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
@@ -1231,7 +1231,7 @@ class RenderViewHostDestructionObserver : public WebContentsObserver {
 // delegate_. This test also verifies crbug.com/117420 and crbug.com/143255 to
 // ensure that a separate SiteInstance is created when navigating to view-source
 // URLs, regardless of current URL.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) {
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest, LeakingRenderViewHosts) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
   net::SpawnedTestServer https_server(
@@ -1306,7 +1306,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) {
 // This used to cause an update to the frame tree of the swapped out RV,
 // just as it was navigating to a real page.  That pre-empted the real
 // navigation and visibly sent the tab to swappedout://.
-IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest,
+IN_PROC_BROWSER_TEST_F(RenderFrameHostManagerTest,
                        DontPreemptNavigationWithFrameTreeUpdate) {
   // Start two servers with different sites.
   ASSERT_TRUE(test_server()->Start());
diff --git a/content/browser/frame_host/render_view_host_manager_unittest.cc b/content/browser/frame_host/render_frame_host_manager_unittest.cc
index 5f46c73..9a4b004 100644
--- a/content/browser/frame_host/render_view_host_manager_unittest.cc
+++ b/content/browser/frame_host/render_frame_host_manager_unittest.cc
@@ -5,7 +5,7 @@
 #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/frame_host/render_frame_host_manager.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
@@ -34,13 +34,13 @@
 namespace content {
 namespace {
 
-class RenderViewHostManagerTestWebUIControllerFactory
+class RenderFrameHostManagerTestWebUIControllerFactory
     : public WebUIControllerFactory {
  public:
-  RenderViewHostManagerTestWebUIControllerFactory()
+  RenderFrameHostManagerTestWebUIControllerFactory()
     : should_create_webui_(false) {
   }
-  virtual ~RenderViewHostManagerTestWebUIControllerFactory() {}
+  virtual ~RenderFrameHostManagerTestWebUIControllerFactory() {}
 
   void set_should_create_webui(bool should_create_webui) {
     should_create_webui_ = should_create_webui;
@@ -72,7 +72,7 @@ class RenderViewHostManagerTestWebUIControllerFactory
  private:
   bool should_create_webui_;
 
-  DISALLOW_COPY_AND_ASSIGN(RenderViewHostManagerTestWebUIControllerFactory);
+  DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManagerTestWebUIControllerFactory);
 };
 
 class BeforeUnloadFiredWebContentsDelegate : public WebContentsDelegate {
@@ -92,7 +92,7 @@ class BeforeUnloadFiredWebContentsDelegate : public WebContentsDelegate {
 
 }  // namespace
 
-class RenderViewHostManagerTest
+class RenderFrameHostManagerTest
     : public RenderViewHostImplTestHarness {
  public:
   virtual void SetUp() OVERRIDE {
@@ -133,7 +133,7 @@ class RenderViewHostManagerTest
     active_test_rvh()->SendNavigate(max_page_id + 1, url);
   }
 
-  bool ShouldSwapProcesses(RenderViewHostManager* manager,
+  bool ShouldSwapProcesses(RenderFrameHostManager* manager,
                            const NavigationEntryImpl* current_entry,
                            const NavigationEntryImpl* new_entry) const {
     return manager->ShouldSwapBrowsingInstancesForNavigation(current_entry,
@@ -177,14 +177,14 @@ class RenderViewHostManagerTest
   }
 
  private:
-  RenderViewHostManagerTestWebUIControllerFactory factory_;
+  RenderFrameHostManagerTestWebUIControllerFactory factory_;
 };
 
 // Tests that when you navigate from a chrome:// url to another page, and
 // then do that same thing in another tab, that the two resulting pages have
 // different SiteInstances, BrowsingInstances, and RenderProcessHosts. This is
 // a regression test for bug 9364.
-TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
+TEST_F(RenderFrameHostManagerTest, NewTabPageProcesses) {
   set_should_create_webui(true);
   const GURL kChromeUrl("chrome://foo");
   const GURL kDestUrl("http://www.google.com/");
@@ -250,7 +250,7 @@ TEST_F(RenderViewHostManagerTest, NewTabPageProcesses) {
 // action on requests from a non-active renderer.  The main exception is
 // for synchronous messages, which cannot be ignored without leaving the
 // renderer in a stuck state.  See http://crbug.com/93427.
-TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) {
+TEST_F(RenderFrameHostManagerTest, FilterMessagesWhileSwappedOut) {
   const GURL kChromeURL("chrome://foo");
   const GURL kDestUrl("http://www.google.com/");
 
@@ -328,7 +328,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) {
   EXPECT_TRUE(ntp_process_host->sink().GetUniqueMessageMatching(IPC_REPLY_ID));
 }
 
-TEST_F(RenderViewHostManagerTest, WhiteListSwapCompositorFrame) {
+TEST_F(RenderFrameHostManagerTest, WhiteListSwapCompositorFrame) {
   TestRenderViewHost* swapped_out_rvh = CreateSwappedOutRenderViewHost();
   TestRenderWidgetHostView* swapped_out_rwhv =
       static_cast<TestRenderWidgetHostView*>(swapped_out_rvh->GetView());
@@ -345,7 +345,7 @@ TEST_F(RenderViewHostManagerTest, WhiteListSwapCompositorFrame) {
   EXPECT_TRUE(swapped_out_rwhv->did_swap_compositor_frame());
 }
 
-TEST_F(RenderViewHostManagerTest, WhiteListDidActivateAcceleratedCompositing) {
+TEST_F(RenderFrameHostManagerTest, WhiteListDidActivateAcceleratedCompositing) {
   TestRenderViewHost* swapped_out_rvh = CreateSwappedOutRenderViewHost();
 
   MockRenderProcessHost* process_host =
@@ -359,7 +359,7 @@ TEST_F(RenderViewHostManagerTest, WhiteListDidActivateAcceleratedCompositing) {
 
 // Test if RenderViewHost::GetRenderWidgetHosts() only returns active
 // widgets.
-TEST_F(RenderViewHostManagerTest, GetRenderWidgetHostsReturnsActiveViews) {
+TEST_F(RenderFrameHostManagerTest, GetRenderWidgetHostsReturnsActiveViews) {
   TestRenderViewHost* swapped_out_rvh = CreateSwappedOutRenderViewHost();
   EXPECT_TRUE(swapped_out_rvh->is_swapped_out());
 
@@ -379,7 +379,7 @@ TEST_F(RenderViewHostManagerTest, GetRenderWidgetHostsReturnsActiveViews) {
 // RenderViewHost::GetRenderWidgetHosts() returns only active widgets, but
 // RenderViewHostImpl::GetAllRenderWidgetHosts() returns everything
 // including swapped out ones.
-TEST_F(RenderViewHostManagerTest,
+TEST_F(RenderFrameHostManagerTest,
        GetRenderWidgetHostsWithinGetAllRenderWidgetHosts) {
   TestRenderViewHost* swapped_out_rvh = CreateSwappedOutRenderViewHost();
   EXPECT_TRUE(swapped_out_rvh->is_swapped_out());
@@ -403,7 +403,7 @@ TEST_F(RenderViewHostManagerTest,
 
 // Test if SiteInstanceImpl::active_view_count() is correctly updated
 // as views in a SiteInstance get swapped out and in.
-TEST_F(RenderViewHostManagerTest, ActiveViewCountWhileSwappingInandOut) {
+TEST_F(RenderFrameHostManagerTest, ActiveViewCountWhileSwappingInandOut) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
 
@@ -477,7 +477,7 @@ class RenderViewHostDestroyer : public WebContentsObserver {
 // RenderWidget that has been freed while deleting a RenderViewHost in
 // a previous iteration. This is a regression test for
 // http://crbug.com/259859.
-TEST_F(RenderViewHostManagerTest,
+TEST_F(RenderFrameHostManagerTest,
        DetectUseAfterFreeInShutdownRenderViewHostsInSiteInstance) {
   const GURL kChromeURL("chrome://newtab");
   const GURL kUrl1("http://www.google.com");
@@ -510,7 +510,7 @@ TEST_F(RenderViewHostManagerTest,
 // mode. See WebFrameImpl::DidFail(). We check by this test that
 // EnableViewSourceMode message is sent on every navigation regardless
 // RenderView is being newly created or reused.
-TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) {
+TEST_F(RenderFrameHostManagerTest, AlwaysSendEnableViewSourceMode) {
   const GURL kChromeUrl("chrome://foo");
   const GURL kUrl("view-source:http://foo");
 
@@ -559,7 +559,7 @@ TEST_F(RenderViewHostManagerTest, AlwaysSendEnableViewSourceMode) {
 }
 
 // Tests the Init function by checking the initial RenderViewHost.
-TEST_F(RenderViewHostManagerTest, Init) {
+TEST_F(RenderFrameHostManagerTest, Init) {
   // Using TestBrowserContext.
   SiteInstanceImpl* instance =
       static_cast<SiteInstanceImpl*>(SiteInstance::Create(browser_context()));
@@ -567,8 +567,8 @@ TEST_F(RenderViewHostManagerTest, Init) {
 
   scoped_ptr<TestWebContents> web_contents(
       TestWebContents::Create(browser_context(), instance));
-  RenderViewHostManager manager(web_contents.get(), web_contents.get(),
-                                web_contents.get());
+  RenderFrameHostManager manager(web_contents.get(), web_contents.get(),
+                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
 
@@ -582,7 +582,7 @@ TEST_F(RenderViewHostManagerTest, Init) {
 
 // Tests the Navigate function. We navigate three sites consecutively and check
 // how the pending/committed RenderViewHost are modified.
-TEST_F(RenderViewHostManagerTest, Navigate) {
+TEST_F(RenderFrameHostManagerTest, Navigate) {
   TestNotificationTracker notifications;
 
   SiteInstance* instance = SiteInstance::Create(browser_context());
@@ -593,8 +593,8 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
                           Source<WebContents>(web_contents.get()));
 
   // Create.
-  RenderViewHostManager manager(web_contents.get(), web_contents.get(),
-                                web_contents.get());
+  RenderFrameHostManager manager(web_contents.get(), web_contents.get(),
+                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
 
@@ -674,7 +674,7 @@ TEST_F(RenderViewHostManagerTest, Navigate) {
 // function can handle a new navigation event before the previous navigation
 // has been committed. This is also a regression test for
 // http://crbug.com/104600.
-TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
+TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyReNavigation) {
   TestNotificationTracker notifications;
 
   SiteInstance* instance = SiteInstance::Create(browser_context());
@@ -685,8 +685,8 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
                           Source<WebContents>(web_contents.get()));
 
   // Create.
-  RenderViewHostManager manager(web_contents.get(), web_contents.get(),
-                                web_contents.get());
+  RenderFrameHostManager manager(web_contents.get(), web_contents.get(),
+                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
 
@@ -753,8 +753,8 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
   test_host->SendShouldCloseACK(true);
 
   // CrossSiteResourceHandler::StartCrossSiteTransition triggers a
-  // call of RenderViewHostManager::SwapOutOldPage before
-  // RenderViewHostManager::DidNavigateMainFrame is called.
+  // call of RenderFrameHostManager::SwapOutOldPage before
+  // RenderFrameHostManager::DidNavigateMainFrame is called.
   // The RVH is not swapped out until the commit.
   manager.SwapOutOldPage();
   EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
@@ -799,8 +799,8 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
   test_host->SendShouldCloseACK(true);
 
   // CrossSiteResourceHandler::StartCrossSiteTransition triggers a
-  // call of RenderViewHostManager::SwapOutOldPage before
-  // RenderViewHostManager::DidNavigateMainFrame is called.
+  // call of RenderFrameHostManager::SwapOutOldPage before
+  // RenderFrameHostManager::DidNavigateMainFrame is called.
   // The RVH is not swapped out until the commit.
   manager.SwapOutOldPage();
   EXPECT_TRUE(test_process_host->sink().GetUniqueMessageMatching(
@@ -822,14 +822,14 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
 }
 
 // Tests WebUI creation.
-TEST_F(RenderViewHostManagerTest, WebUI) {
+TEST_F(RenderFrameHostManagerTest, WebUI) {
   set_should_create_webui(true);
   SiteInstance* instance = SiteInstance::Create(browser_context());
 
   scoped_ptr<TestWebContents> web_contents(
       TestWebContents::Create(browser_context(), instance));
-  RenderViewHostManager manager(web_contents.get(), web_contents.get(),
-                                web_contents.get());
+  RenderFrameHostManager manager(web_contents.get(), web_contents.get(),
+                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
   EXPECT_FALSE(manager.current_host()->IsRenderViewLive());
@@ -868,15 +868,15 @@ TEST_F(RenderViewHostManagerTest, WebUI) {
 
 // Tests that we can open a WebUI link in a new tab from a WebUI page and still
 // grant the correct bindings.  http://crbug.com/189101.
-TEST_F(RenderViewHostManagerTest, WebUIInNewTab) {
+TEST_F(RenderFrameHostManagerTest, WebUIInNewTab) {
   set_should_create_webui(true);
   SiteInstance* blank_instance = SiteInstance::Create(browser_context());
 
   // Create a blank tab.
   scoped_ptr<TestWebContents> web_contents1(
       TestWebContents::Create(browser_context(), blank_instance));
-  RenderViewHostManager manager1(web_contents1.get(), web_contents1.get(),
-                                 web_contents1.get());
+  RenderFrameHostManager manager1(web_contents1.get(), web_contents1.get(),
+                                  web_contents1.get());
   manager1.Init(
       browser_context(), blank_instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
   // Test the case that new RVH is considered live.
@@ -905,8 +905,8 @@ TEST_F(RenderViewHostManagerTest, WebUIInNewTab) {
   // Now simulate clicking a link that opens in a new tab.
   scoped_ptr<TestWebContents> web_contents2(
       TestWebContents::Create(browser_context(), webui_instance));
-  RenderViewHostManager manager2(web_contents2.get(), web_contents2.get(),
-                                 web_contents2.get());
+  RenderFrameHostManager manager2(web_contents2.get(), web_contents2.get(),
+                                  web_contents2.get());
   manager2.Init(
       browser_context(), webui_instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
   // Make sure the new RVH is considered live.  This is usually done in
@@ -930,7 +930,7 @@ TEST_F(RenderViewHostManagerTest, WebUIInNewTab) {
 
 // Tests that we don't end up in an inconsistent state if a page does a back and
 // then reload. http://crbug.com/51680
-TEST_F(RenderViewHostManagerTest, PageDoesBackAndReload) {
+TEST_F(RenderFrameHostManagerTest, PageDoesBackAndReload) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.evil-site.com/");
 
@@ -977,7 +977,7 @@ TEST_F(RenderViewHostManagerTest, PageDoesBackAndReload) {
 
 // Ensure that we can go back and forward even if a SwapOut ACK isn't received.
 // See http://crbug.com/93427.
-TEST_F(RenderViewHostManagerTest, NavigateAfterMissingSwapOutACK) {
+TEST_F(RenderFrameHostManagerTest, NavigateAfterMissingSwapOutACK) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
 
@@ -1025,27 +1025,27 @@ TEST_F(RenderViewHostManagerTest, NavigateAfterMissingSwapOutACK) {
 // Test that we create swapped out RVHs for the opener chain when navigating an
 // opened tab cross-process.  This allows us to support certain cross-process
 // JavaScript calls (http://crbug.com/99202).
-TEST_F(RenderViewHostManagerTest, CreateSwappedOutOpenerRVHs) {
+TEST_F(RenderFrameHostManagerTest, CreateSwappedOutOpenerRVHs) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
   const GURL kChromeUrl("chrome://foo");
 
   // Navigate to an initial URL.
   contents()->NavigateAndCommit(kUrl1);
-  RenderViewHostManager* manager = contents()->GetRenderManagerForTesting();
+  RenderFrameHostManager* manager = contents()->GetRenderManagerForTesting();
   TestRenderViewHost* rvh1 = test_rvh();
 
   // Create 2 new tabs and simulate them being the opener chain for the main
   // tab.  They should be in the same SiteInstance.
   scoped_ptr<TestWebContents> opener1(
       TestWebContents::Create(browser_context(), rvh1->GetSiteInstance()));
-  RenderViewHostManager* opener1_manager =
+  RenderFrameHostManager* opener1_manager =
       opener1->GetRenderManagerForTesting();
   contents()->SetOpener(opener1.get());
 
   scoped_ptr<TestWebContents> opener2(
       TestWebContents::Create(browser_context(), rvh1->GetSiteInstance()));
-  RenderViewHostManager* opener2_manager =
+  RenderFrameHostManager* opener2_manager =
       opener2->GetRenderManagerForTesting();
   opener1->SetOpener(opener2.get());
 
@@ -1091,7 +1091,7 @@ TEST_F(RenderViewHostManagerTest, CreateSwappedOutOpenerRVHs) {
 
 // Test that we clean up swapped out RenderViewHosts when a process hosting
 // those associated RenderViews crashes. http://crbug.com/258993
-TEST_F(RenderViewHostManagerTest, CleanUpSwappedOutRVHOnProcessCrash) {
+TEST_F(RenderFrameHostManagerTest, CleanUpSwappedOutRVHOnProcessCrash) {
   const GURL kUrl1("http://www.google.com/");
   const GURL kUrl2("http://www.chromium.org/");
 
@@ -1102,7 +1102,7 @@ TEST_F(RenderViewHostManagerTest, CleanUpSwappedOutRVHOnProcessCrash) {
   // Create a new tab as an opener for the main tab.
   scoped_ptr<TestWebContents> opener1(
       TestWebContents::Create(browser_context(), rvh1->GetSiteInstance()));
-  RenderViewHostManager* opener1_manager =
+  RenderFrameHostManager* opener1_manager =
       opener1->GetRenderManagerForTesting();
   contents()->SetOpener(opener1.get());
 
@@ -1142,7 +1142,7 @@ TEST_F(RenderViewHostManagerTest, CleanUpSwappedOutRVHOnProcessCrash) {
 // Test that RenderViewHosts created for WebUI navigations are properly
 // granted WebUI bindings even if an unprivileged swapped out RenderViewHost
 // is in the same process (http://crbug.com/79918).
-TEST_F(RenderViewHostManagerTest, EnableWebUIWithSwappedOutOpener) {
+TEST_F(RenderFrameHostManagerTest, EnableWebUIWithSwappedOutOpener) {
   set_should_create_webui(true);
   const GURL kSettingsUrl("chrome://chrome/settings");
   const GURL kPluginUrl("chrome://plugins");
@@ -1158,7 +1158,7 @@ TEST_F(RenderViewHostManagerTest, EnableWebUIWithSwappedOutOpener) {
   // tab.  It should be in the same SiteInstance.
   scoped_ptr<TestWebContents> opener1(
       TestWebContents::Create(browser_context(), rvh1->GetSiteInstance()));
-  RenderViewHostManager* opener1_manager =
+  RenderFrameHostManager* opener1_manager =
       opener1->GetRenderManagerForTesting();
   contents()->SetOpener(opener1.get());
 
@@ -1181,7 +1181,7 @@ TEST_F(RenderViewHostManagerTest, EnableWebUIWithSwappedOutOpener) {
 }
 
 // Test that we reuse the same guest SiteInstance if we navigate across sites.
-TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) {
+TEST_F(RenderFrameHostManagerTest, NoSwapOnGuestNavigations) {
   TestNotificationTracker notifications;
 
   GURL guest_url(std::string(kGuestScheme).append("://abc123"));
@@ -1191,8 +1191,8 @@ TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) {
       TestWebContents::Create(browser_context(), instance));
 
   // Create.
-  RenderViewHostManager manager(web_contents.get(), web_contents.get(),
-                                web_contents.get());
+  RenderFrameHostManager manager(web_contents.get(), web_contents.get(),
+                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
 
@@ -1243,7 +1243,7 @@ TEST_F(RenderViewHostManagerTest, NoSwapOnGuestNavigations) {
 
 // Test that we cancel a pending RVH if we close the tab while it's pending.
 // http://crbug.com/294697.
-TEST_F(RenderViewHostManagerTest, NavigateWithEarlyClose) {
+TEST_F(RenderFrameHostManagerTest, NavigateWithEarlyClose) {
   TestNotificationTracker notifications;
 
   SiteInstance* instance = SiteInstance::Create(browser_context());
@@ -1256,8 +1256,8 @@ TEST_F(RenderViewHostManagerTest, NavigateWithEarlyClose) {
                           Source<WebContents>(web_contents.get()));
 
   // Create.
-  RenderViewHostManager manager(web_contents.get(), web_contents.get(),
-                                web_contents.get());
+  RenderFrameHostManager manager(web_contents.get(), web_contents.get(),
+                                 web_contents.get());
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE, MSG_ROUTING_NONE);
 
diff --git a/content/browser/loader/cross_site_resource_handler.cc b/content/browser/loader/cross_site_resource_handler.cc
index 51d830f..74afc84 100644
--- a/content/browser/loader/cross_site_resource_handler.cc
+++ b/content/browser/loader/cross_site_resource_handler.cc
@@ -133,7 +133,7 @@ bool CrossSiteResourceHandler::OnResponseStarted(
   // In both cases, any pending RenderViewHost (if one was created for this
   // navigation) will stick around until the next cross-site navigation, since
   // we are unable to tell when to destroy it.
-  // See RenderViewHostManager::RendererAbortedProvisionalLoad.
+  // See RenderFrameHostManager::RendererAbortedProvisionalLoad.
   if (!swap_needed || info->IsDownload() ||
       (response->head.headers.get() &&
        response->head.headers->response_code() == 204)) {
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index c02954d..f3bf8aa 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -79,7 +79,7 @@ class CONTENT_EXPORT RenderViewHostDelegate {
  public:
   // RendererManagerment -------------------------------------------------------
   // Functions for managing switching of Renderers. For WebContents, this is
-  // implemented by the RenderViewHostManager.
+  // implemented by the RenderFrameHostManager.
 
   class CONTENT_EXPORT RendererManagement {
    public:
diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
index 649ee4b..edaeb3e 100644
--- a/content/browser/site_instance_impl.h
+++ b/content/browser/site_instance_impl.h
@@ -71,7 +71,7 @@ class CONTENT_EXPORT SiteInstanceImpl : public SiteInstance,
   // For example, Chrome uses this to replace hosted app URLs with extension
   // hosts.
   // Only public so that we can make a consistent process swap decision in
-  // RenderViewHostManager.
+  // RenderFrameHostManager.
   static GURL GetEffectiveURL(BrowserContext* browser_context,
                               const GURL& url);
 
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index a48dfd7..b83285c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -131,8 +131,8 @@
 //   a transfer was needed for a redirect).
 // - If so, CrossSiteResourceHandler pauses the response to first run the old
 //   page's unload handler.  It does this by asynchronously calling the
-//   OnCrossSiteResponse method of RenderViewHostManager on the UI thread, which
-//   sends a SwapOut message to the current RVH.
+//   OnCrossSiteResponse method of RenderFrameHostManager on the UI thread,
+//   which sends a SwapOut message to the current RVH.
 // - Once the unload handler is finished, RVHM::SwappedOut checks if a transfer
 //   to a new process is needed, based on the stored pending_nav_params_.  (This
 //   is independent of whether we started out with a cross-process navigation.)
@@ -145,7 +145,7 @@
 // - The pending renderer sends a FrameNavigate message that invokes the
 //   DidNavigate method.  This replaces the current RVH with the
 //   pending RVH.
-// - The previous renderer is kept swapped out in RenderViewHostManager in case
+// - The previous renderer is kept swapped out in RenderFrameHostManager in case
 //   the user goes back.  The process only stays live if another tab is using
 //   it, but if so, the existing frame relationships will be maintained.
 
@@ -465,7 +465,7 @@ BrowserPluginGuest* WebContentsImpl::CreateGuest(
   return new_contents->browser_plugin_guest_.get();
 }
 
-RenderViewHostManager* WebContentsImpl::GetRenderManagerForTesting() {
+RenderFrameHostManager* WebContentsImpl::GetRenderManagerForTesting() {
   return GetRenderManager();
 }
 
@@ -1019,7 +1019,7 @@ WebContents* WebContentsImpl::GetWebContents() {
 
 void WebContentsImpl::Init(const WebContents::CreateParams& params) {
   // This is set before initializing the render manager since
-  // RenderViewHostManager::Init calls back into us via its delegate to ask if
+  // RenderFrameHostManager::Init calls back into us via its delegate to ask if
   // it should be hidden.
   should_normally_be_visible_ = !params.initially_hidden;
 
@@ -1624,7 +1624,7 @@ bool WebContentsImpl::NavigateToEntry(
   }
 
   // TODO(creis): Use entry->frame_tree_node_id() to pick which
-  // RenderViewHostManager to use.
+  // RenderFrameHostManager to use.
   RenderViewHostImpl* dest_render_view_host =
       static_cast<RenderViewHostImpl*>(GetRenderManager()->Navigate(entry));
   if (!dest_render_view_host)
@@ -2095,7 +2095,7 @@ void WebContentsImpl::DidFailProvisionalLoadWithError(
     //
     // We can't tell this apart, so we think we're tearing down the current page
     // which will cause a crash later one. There is also some code in
-    // RenderViewHostManager::RendererAbortedProvisionalLoad that is commented
+    // RenderFrameHostManager::RendererAbortedProvisionalLoad that is commented
     // out because of this problem.
     //
     // http://code.google.com/p/chromium/issues/detail?id=2855
@@ -2855,7 +2855,7 @@ void WebContentsImpl::DidNavigate(
     // When overscroll navigation gesture is enabled, a screenshot of the page
     // in its current state is taken so that it can be used during the
     // nav-gesture. It is necessary to take the screenshot here, before calling
-    // RenderViewHostManager::DidNavigateMainFrame, because that can change
+    // RenderFrameHostManager::DidNavigateMainFrame, because that can change
     // WebContents::GetRenderViewHost to return the new host, instead of the one
     // that may have just been swapped out.
     if (delegate_ && delegate_->CanOverscrollContent())
@@ -3643,7 +3643,7 @@ bool WebContentsImpl::IsHidden() {
   return capturer_count_ == 0 && !should_normally_be_visible_;
 }
 
-RenderViewHostManager* WebContentsImpl::GetRenderManager() const {
+RenderFrameHostManager* WebContentsImpl::GetRenderManager() const {
   return frame_tree_.root()->render_manager();
 }
 
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index dcc506a..1717077 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -19,7 +19,7 @@
 #include "content/browser/frame_host/navigation_controller_delegate.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/navigator_delegate.h"
-#include "content/browser/frame_host/render_view_host_manager.h"
+#include "content/browser/frame_host/render_frame_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/common/content_export.h"
@@ -79,7 +79,7 @@ class CONTENT_EXPORT WebContentsImpl
     : public NON_EXPORTED_BASE(WebContents),
       public RenderViewHostDelegate,
       public RenderWidgetHostDelegate,
-      public RenderViewHostManager::Delegate,
+      public RenderFrameHostManager::Delegate,
       public NotificationObserver,
       public NON_EXPORTED_BASE(NavigationControllerDelegate),
       public NON_EXPORTED_BASE(NavigatorDelegate) {
@@ -128,7 +128,7 @@ class CONTENT_EXPORT WebContentsImpl
 #endif
 
   // Expose the render manager for testing.
-  RenderViewHostManager* GetRenderManagerForTesting();
+  RenderFrameHostManager* GetRenderManagerForTesting();
 
   // Returns guest browser plugin object, or NULL if this WebContents is not a
   // guest.
@@ -443,7 +443,7 @@ class CONTENT_EXPORT WebContentsImpl
   virtual gfx::NativeViewAccessible GetParentNativeViewAccessible() OVERRIDE;
 #endif
 
-  // RenderViewHostManager::Delegate -------------------------------------------
+  // RenderFrameHostManager::Delegate ------------------------------------------
 
   virtual bool CreateRenderViewForRenderManager(
       RenderViewHost* render_view_host, int opener_route_id) OVERRIDE;
@@ -558,7 +558,7 @@ class CONTENT_EXPORT WebContentsImpl
   FRIEND_TEST_ALL_PREFIXES(WebContentsImplTest, FrameTreeShape);
   FRIEND_TEST_ALL_PREFIXES(FormStructureBrowserTest, HTMLFiles);
   FRIEND_TEST_ALL_PREFIXES(NavigationControllerTest, HistoryNavigate);
-  FRIEND_TEST_ALL_PREFIXES(RenderViewHostManagerTest, PageDoesBackAndReload);
+  FRIEND_TEST_ALL_PREFIXES(RenderFrameHostManagerTest, PageDoesBackAndReload);
 
   // So InterstitialPageImpl can access SetIsLoading.
   friend class InterstitialPageImpl;
@@ -761,7 +761,7 @@ class CONTENT_EXPORT WebContentsImpl
 
   // TODO(creis): This should take in a FrameTreeNode to know which node's
   // render manager to return.  For now, we just return the root's.
-  RenderViewHostManager* GetRenderManager() const;
+  RenderFrameHostManager* GetRenderManager() const;
 
   RenderViewHostImpl* GetRenderViewHostImpl();
 
diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h
index de3059f..a359117 100644
--- a/content/browser/webui/web_ui_impl.h
+++ b/content/browser/webui/web_ui_impl.h
@@ -25,7 +25,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
 
   // Called by WebContentsImpl when the RenderView is first created. This is
   // *not* called for every page load because in some cases
-  // RenderViewHostManager will reuse RenderView instances.
+  // RenderFrameHostManager will reuse RenderView instances.
   void RenderViewCreated(RenderViewHost* render_view_host);
 
   // WebUI implementation:
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index f4843b3..d219981 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -523,10 +523,10 @@
     'browser/frame_host/render_frame_host_factory.h',
     'browser/frame_host/render_frame_host_impl.cc',
     'browser/frame_host/render_frame_host_impl.h',
+    'browser/frame_host/render_frame_host_manager.cc',
+    'browser/frame_host/render_frame_host_manager.h',
     'browser/frame_host/render_frame_message_filter.cc',
     'browser/frame_host/render_frame_message_filter.h',
-    'browser/frame_host/render_view_host_manager.cc',
-    'browser/frame_host/render_view_host_manager.h',
     'browser/gamepad/gamepad_data_fetcher.h',
     'browser/gamepad/gamepad_platform_data_fetcher.h',
     'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index fe9c54b..bcd0728 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -373,7 +373,7 @@
         'browser/frame_host/frame_tree_unittest.cc',
         'browser/frame_host/navigation_controller_impl_unittest.cc',
         'browser/frame_host/navigation_entry_impl_unittest.cc',
-        'browser/frame_host/render_view_host_manager_unittest.cc',
+        'browser/frame_host/render_frame_host_manager_unittest.cc',
         'browser/gamepad/gamepad_provider_unittest.cc',
         'browser/gamepad/gamepad_test_helpers.cc',
         'browser/gamepad/gamepad_test_helpers.h',
@@ -946,6 +946,7 @@
             'browser/download/mhtml_generation_browsertest.cc',
             'browser/download/save_package_browsertest.cc',
             'browser/fileapi/file_system_browsertest.cc',
+            'browser/frame_host/render_frame_host_manager_browsertest.cc',
             'browser/gpu/compositor_util_browsertest.cc',
             'browser/gpu/gpu_ipc_browsertests.cc',
             'browser/indexed_db/indexed_db_browsertest.cc',
@@ -960,7 +961,6 @@
             'browser/plugin_service_impl_browsertest.cc',
             'browser/renderer_host/render_process_host_browsertest.cc',
             'browser/renderer_host/render_view_host_browsertest.cc',
-            'browser/renderer_host/render_view_host_manager_browsertest.cc',
             'browser/renderer_host/render_widget_host_browsertest.cc',
             'browser/renderer_host/render_widget_host_view_browsertest.cc',
             'browser/security_exploit_browsertest.cc',
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 8de148f..3e98195 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1714,7 +1714,7 @@ void RenderViewImpl::OnStop() {
   if (webview()) {
     WebFrame* main_frame = webview()->mainFrame();
     // Stop the alt error page fetcher. If we let it continue it may complete
-    // and cause RenderViewHostManager to swap to this RenderView, even though
+    // and cause RenderFrameHostManager to swap to this RenderView, even though
     // it may no longer be active.
     StopAltErrorPageFetcher(main_frame->provisionalDataSource());
     StopAltErrorPageFetcher(main_frame->dataSource());
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 7b49523..15ea934 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -456,7 +456,7 @@
    fun:content::SiteInstanceImpl::GetProcess
    fun:RenderViewHostImpl
    fun:content::RenderViewHostFactory::Create
-   fun:content::RenderViewHostManager::Init
+   fun:content::RenderFrameHostManager::Init
    fun:content::WebContentsImpl::Init
    fun:content::TestWebContents::Create
    fun:content::WebContentsTester::CreateTestWebContents
@@ -633,7 +633,7 @@
    fun:GetStoragePartitionFromConfig
    fun:content::BrowserContext::GetStoragePartition
    fun:content::NavigationControllerImpl::GetSessionStorageNamespace
-   fun:content::RenderViewHostManager::Init
+   fun:content::RenderFrameHostManager::Init
 }
 {
    bug_236791
diff --git a/tools/telemetry/telemetry/page/page_runner.py b/tools/telemetry/telemetry/page/page_runner.py
index 82d7efe..7d1f024 100644
--- a/tools/telemetry/telemetry/page/page_runner.py
+++ b/tools/telemetry/telemetry/page/page_runner.py
@@ -93,7 +93,7 @@ class _RunState(object):
           self.browser.tabs[-1].Close()
 
       # Must wait for tab to commit otherwise it can commit after the next
-      # navigation has begun and RenderViewHostManager::DidNavigateMainFrame()
+      # navigation has begun and RenderFrameHostManager::DidNavigateMainFrame()
       # will cancel the next navigation because it's pending. This manifests as
       # the first navigation in a PageSet freezing indefinitly because the
       # navigation was silently cancelled when |self.browser.tabs[0]| was
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index e72099f..4866fbc 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -1985,9 +1985,9 @@
    fun:_ZN21RenderProcessHostImpl4Init*
    ...
    fun:_ZN15WebContentsImpl32CreateRenderViewForRenderManagerEP*
-   fun:_ZN21RenderViewHostManager14InitRenderViewEP*
+   fun:_ZN22RenderFrameHostManager14InitRenderViewEP*
    ...
-   fun:_ZN21RenderViewHostManager8NavigateERKN7content19NavigationEntryImplE
+   fun:_ZN22RenderFrameHostManager8NavigateERKN7content19NavigationEntryImplE
    fun:_ZN15WebContentsImpl15NavigateToEntryERKN7content19NavigationEntryImplENS0_20NavigationController10ReloadTypeE
 }
 {
@@ -4245,7 +4245,7 @@
    fun:_ZN7content16SiteInstanceImpl10GetProcessEv
    fun:_ZN7content18RenderViewHostImplC1EPNS_12SiteInstanceEPNS_22RenderViewHostDelegateEPNS_24RenderWidgetHostDelegateEibPNS_23SessionStorageNamespaceE
    fun:_ZN7content21RenderViewHostFactory6CreateEPNS_12SiteInstanceEPNS_22RenderViewHostDelegateEPNS_24RenderWidgetHostDelegateEibPNS_23SessionStorageNamespaceE
-   fun:_ZN7content21RenderViewHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEi
+   fun:_ZN7content22RenderFrameHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEi
    fun:_ZN7content15WebContentsImpl4InitERKNS_11WebContents12CreateParamsE
    fun:_ZN7content15TestWebContents6CreateEPNS_14BrowserContextEPNS_12SiteInstanceE
    fun:_ZN7content17WebContentsTester21CreateTestWebContentsEPNS_14BrowserContextEPNS_12SiteInstanceE
@@ -5596,7 +5596,7 @@
    fun:_ZN7content16SiteInstanceImpl10GetProcessEv
    fun:_ZN7content18RenderViewHostImplC1EPNS_12SiteInstanceEPNS_22RenderViewHostDelegateEPNS_24RenderWidgetHostDelegateEiibPNS_23SessionStorageNamespaceE
    fun:_ZN7content21RenderViewHostFactory6CreateEPNS_12SiteInstanceEPNS_22RenderViewHostDelegateEPNS_24RenderWidgetHostDelegateEiibPNS_23SessionStorageNamespaceE
-   fun:_ZN7content21RenderViewHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEii
+   fun:_ZN7content22RenderFrameHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEii
    fun:_ZN7content15WebContentsImpl4InitERKNS_11WebContents12CreateParamsE
    fun:_ZN7content15TestWebContents6CreateEPNS_14BrowserContextEPNS_12SiteInstanceE
    fun:_ZN7content17WebContentsTester21CreateTestWebContentsEPNS_14BrowserContextEPNS_12SiteInstanceE
@@ -5625,7 +5625,7 @@
    fun:_ZN7content12_GLOBAL__N_129GetStoragePartitionFromConfigEPNS_14BrowserContextERKSsS4_b
    fun:_ZN7content14BrowserContext19GetStoragePartitionEPS0_PNS_12SiteInstanceE
    fun:_ZN7content24NavigationControllerImpl26GetSessionStorageNamespaceEPNS_12SiteInstanceE
-   fun:_ZN7content21RenderViewHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEii
+   fun:_ZN7content22RenderFrameHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEii
    fun:_ZN7content15WebContentsImpl4InitERKNS_11WebContents12CreateParamsE
    fun:_ZN7content15TestWebContents6CreateEPNS_14BrowserContextEPNS_12SiteInstanceE
    fun:_ZN7content25RenderViewHostTestHarness21CreateTestWebContentsEv
@@ -5649,7 +5649,7 @@
    fun:_ZN7content12_GLOBAL__N_129GetStoragePartitionFromConfigEPNS_14BrowserContextERKSsS4_b
    fun:_ZN7content14BrowserContext19GetStoragePartitionEPS0_PNS_12SiteInstanceE
    fun:_ZN7content24NavigationControllerImpl26GetSessionStorageNamespaceEPNS_12SiteInstanceE
-   fun:_ZN7content21RenderViewHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEii
+   fun:_ZN7content22RenderFrameHostManager4InitEPNS_14BrowserContextEPNS_12SiteInstanceEii
    fun:_ZN7content15WebContentsImpl4InitERKNS_11WebContents12CreateParamsE
    fun:_ZN7content15TestWebContents6CreateEPNS_14BrowserContextEPNS_12SiteInstanceE
    fun:_ZN7content25RenderViewHostTestHarness21CreateTestWebContentsEv
diff --git a/tools/valgrind/memcheck/suppressions_mac.txt b/tools/valgrind/memcheck/suppressions_mac.txt
index a8ff02d..01a80ca 100644
--- a/tools/valgrind/memcheck/suppressions_mac.txt
+++ b/tools/valgrind/memcheck/suppressions_mac.txt
@@ -1074,7 +1074,7 @@
    fun:_ZN16RenderWidgetHost21GetCompositingSurfaceEv
    fun:_ZN14RenderViewHost16CreateRenderViewERKSbItN4base20string16_char_traitsESaItEE
    fun:_ZN15WebContentsImpl32CreateRenderViewForRenderManagerEP14RenderViewHost
-   fun:_ZN21RenderViewHostManager14InitRenderViewEP14RenderViewHostRK15NavigationEntry
+   fun:_ZN22RenderFrameHostManager14InitRenderViewEP14RenderViewHostRK15NavigationEntry
 }
 {
    bug_80239_b