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

chrome/browser/ui/webui/web_ui_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 "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 48 matching lines @@
     // Check the flags. Some should reflect the new page (URL, title), some
     // should reflect the old one (bookmark bar) until it has committed.
     EXPECT_TRUE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
     EXPECT_FALSE(contents->FocusLocationBarByDefault());
 
     // Commit the regular page load. Note that we must send it to the "pending"
     // RenderViewHost if there is one, since this transition will also cause a
     // process transition, and our RVH pointer will be the "committed" one.
     // In the second call to this function from WebUIToStandard, it won't
     // actually be pending, which is the point of this test.
-    if (contents->render_manager_for_testing()->pending_render_view_host()) {
+    if (contents->GetRenderManagerForTesting()->pending_render_view_host()) {
       static_cast<TestRenderViewHost*>(
-          contents->render_manager_for_testing()->
+          contents->GetRenderManagerForTesting()->
           pending_render_view_host())->SendNavigate(page_id + 1, next_url);
     } else {
       static_cast<TestRenderViewHost*>(
           contents->GetRenderViewHost())->SendNavigate(page_id + 1, next_url);
     }
 
     // The state should now reflect a regular page.
     EXPECT_TRUE(wrapper->favicon_tab_helper()->ShouldDisplayFavicon());
     EXPECT_FALSE(contents->FocusLocationBarByDefault());
   }
@@ skipping 122 matching lines @@
   // Navigate forward.  Shouldn't focus the location bar.
   focus_called = tc->focus_called();
   ASSERT_TRUE(controller().CanGoForward());
   controller().GoForward();
   old_rvh = rvh();
   old_rvh->SendShouldCloseACK(true);
   pending_rvh()->SendNavigate(next_page_id, next_url);
   old_rvh->OnSwapOutACK();
   EXPECT_EQ(focus_called, tc->focus_called());
 }