Clean up a few TODO items.

content/browser/tab_contents/test_tab_contents.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 "content/browser/tab_contents/test_tab_contents.h"
 
 #include <utility>
 
 #include "content/browser/browser_url_handler_impl.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 20 matching lines @@
       delegate_view_override_(NULL),
       expect_set_history_length_and_prune_(false),
       expect_set_history_length_and_prune_site_instance_(NULL),
       expect_set_history_length_and_prune_history_length_(0),
       expect_set_history_length_and_prune_min_page_id_(-1) {
 }
 
 TestTabContents::~TestTabContents() {
 }
 
-RenderViewHost* TestTabContents::pending_rvh() const {
+RenderViewHost* TestTabContents::GetPendingRenderViewHost() const {
   return render_manager_.pending_render_view_host_;
 }
 
 TestRenderViewHost* TestTabContents::pending_test_rvh() const {
-  return static_cast<TestRenderViewHost*>(pending_rvh());
+  return static_cast<TestRenderViewHost*>(GetPendingRenderViewHost());
 }
 
 void TestTabContents::TestDidNavigate(RenderViewHost* render_view_host,
                                       int page_id,
                                       const GURL& url,
                                       content::PageTransition transition) {
   TestDidNavigateWithReferrer(render_view_host,
                               page_id,
                               url,
                               content::Referrer(),
@@ skipping 58 matching lines @@
   // a notification that it actually navigated.
   CommitPendingNavigation();
 }
 
 void TestTabContents::CommitPendingNavigation() {
   // If we are doing a cross-site navigation, this simulates the current RVH
   // notifying that it has unloaded so the pending RVH is resumed and can
   // navigate.
   ProceedWithCrossSiteNavigation();
   RenderViewHost* old_rvh = render_manager_.current_host();
-  TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>(pending_rvh());
+  TestRenderViewHost* rvh =
+      static_cast<TestRenderViewHost*>(GetPendingRenderViewHost());
   if (!rvh)
     rvh = static_cast<TestRenderViewHost*>(old_rvh);
 
   const NavigationEntry* entry = GetController().GetPendingEntry();
   DCHECK(entry);
   int page_id = entry->GetPageID();
   if (page_id == -1) {
     // It's a new navigation, assign a never-seen page id to it.
     page_id = GetMaxPageIDForSiteInstance(rvh->GetSiteInstance()) + 1;
   }
   rvh->SendNavigate(page_id, entry->GetURL());
 
   // Simulate the SwapOut_ACK that fires if you commit a cross-site navigation
   // without making any network requests.
   if (old_rvh != rvh)
     static_cast<RenderViewHostImpl*>(old_rvh)->OnSwapOutACK();
 }
 
 int TestTabContents::GetNumberOfFocusCalls() {
   NOTREACHED();
   return 0;
 }
 
 void TestTabContents::ProceedWithCrossSiteNavigation() {
-  if (!pending_rvh())
+  if (!GetPendingRenderViewHost())
     return;
   TestRenderViewHost* rvh = static_cast<TestRenderViewHost*>(
       render_manager_.current_host());
   rvh->SendShouldCloseACK(true);
 }
 
 content::RenderViewHostDelegate::View* TestTabContents::GetViewDelegate() {
   if (delegate_view_override_)
     return delegate_view_override_;
   return TabContents::GetViewDelegate();
@@ skipping 13 matching lines @@
 void TestTabContents::SetHistoryLengthAndPrune(
     const SiteInstance* site_instance, int history_length,
     int32 min_page_id) {
   EXPECT_TRUE(expect_set_history_length_and_prune_);
   expect_set_history_length_and_prune_ = false;
   EXPECT_EQ(expect_set_history_length_and_prune_site_instance_, site_instance);
   EXPECT_EQ(expect_set_history_length_and_prune_history_length_,
             history_length);
   EXPECT_EQ(expect_set_history_length_and_prune_min_page_id_, min_page_id);
 }