Move a bunch of methods from TabContents into the WebContents interface. This change either moves...

content/browser/tab_contents/render_view_host_manager_unittest.cc

 // Copyright (c) 2011 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 "content/browser/browser_thread_impl.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller.h"
@@ skipping 154 matching lines @@
   // Make a second tab.
   TestTabContents contents2(browser_context(), NULL);
 
   // Load the two URLs in the second tab. Note that the first navigation creates
   // a RVH that's not pending (since there is no cross-site transition), so
   // we use the committed one.
   contents2.GetController().LoadURL(
       kNtpUrl, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
   TestRenderViewHost* ntp_rvh2 = static_cast<TestRenderViewHost*>(
-      contents2.render_manager_for_testing()->current_host());
+      contents2.GetRenderManagerForTesting()->current_host());
   EXPECT_FALSE(contents2.cross_navigation_pending());
   ntp_rvh2->SendNavigate(100, kNtpUrl);
 
   // The second one is the opposite, creating a cross-site transition and
   // requiring a beforeunload ack.
   contents2.GetController().LoadURL(
       kDestUrl, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
   EXPECT_TRUE(contents2.cross_navigation_pending());
   TestRenderViewHost* dest_rvh2 = static_cast<TestRenderViewHost*>(
-      contents2.render_manager_for_testing()->pending_render_view_host());
+      contents2.GetRenderManagerForTesting()->pending_render_view_host());
   ASSERT_TRUE(dest_rvh2);
   ntp_rvh2->SendShouldCloseACK(true);
   dest_rvh2->SendNavigate(101, kDestUrl);
   ntp_rvh2->OnSwapOutACK();
 
   // The two RVH's should be different in every way.
   EXPECT_NE(active_rvh()->process(), dest_rvh2->process());
   EXPECT_NE(active_rvh()->site_instance(), dest_rvh2->site_instance());
   EXPECT_NE(active_rvh()->site_instance()->browsing_instance(),
             dest_rvh2->site_instance()->browsing_instance());
 
   // Navigate both to the new tab page, and verify that they share a
   // SiteInstance.
   NavigateActiveAndCommit(kNtpUrl);
 
   contents2.GetController().LoadURL(
       kNtpUrl, content::Referrer(), content::PAGE_TRANSITION_LINK,
       std::string());
   dest_rvh2->SendShouldCloseACK(true);
-  static_cast<TestRenderViewHost*>(contents2.render_manager_for_testing()->
+  static_cast<TestRenderViewHost*>(contents2.GetRenderManagerForTesting()->
      pending_render_view_host())->SendNavigate(102, kNtpUrl);
   dest_rvh2->OnSwapOutACK();
 
   EXPECT_EQ(active_rvh()->site_instance(),
       contents2.GetRenderViewHost()->site_instance());
 }
 
 // When there is an error with the specified page, renderer exits view-source
 // mode. See WebFrameImpl::DidFail(). We check by this test that
 // EnableViewSourceMode message is sent on every navigation regardless
@@ skipping 364 matching lines @@
   // deleted.
   contents()->NavigateAndCommit(kUrl1);
   contents()->NavigateAndCommit(kUrl2);
   RenderViewHost* evil_rvh = contents()->GetRenderViewHost();
 
   // Now let's simulate the evil page calling history.back().
   contents()->OnGoToEntryAtOffset(-1);
   // We should have a new pending RVH.
   // Note that in this case, the navigation has not committed, so evil_rvh will
   // not be deleted yet.
-  EXPECT_NE(evil_rvh, contents()->render_manager_for_testing()->
+  EXPECT_NE(evil_rvh, contents()->GetRenderManagerForTesting()->
       pending_render_view_host());
 
   // Before that RVH has committed, the evil page reloads itself.
   ViewHostMsg_FrameNavigate_Params params;
   params.page_id = 1;
   params.url = kUrl2;
   params.transition = content::PAGE_TRANSITION_CLIENT_REDIRECT;
   params.should_update_history = false;
   params.gesture = NavigationGestureAuto;
   params.was_within_same_page = false;
   params.is_post = false;
   params.content_state = webkit_glue::CreateHistoryStateForURL(GURL(kUrl2));
   contents()->DidNavigate(evil_rvh, params);
 
   // That should have cancelled the pending RVH, and the evil RVH should be the
   // current one.
-  EXPECT_TRUE(contents()->render_manager_for_testing()->
+  EXPECT_TRUE(contents()->GetRenderManagerForTesting()->
       pending_render_view_host() == NULL);
-  EXPECT_EQ(evil_rvh, contents()->render_manager_for_testing()->current_host());
+  EXPECT_EQ(evil_rvh, contents()->GetRenderManagerForTesting()->current_host());
 
   // Also we should not have a pending navigation entry.
   NavigationEntry* entry = contents()->GetController().GetActiveEntry();
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(kUrl2, entry->url());
 }