Make the RenderViewHostFactory a global. This prevents us from having to pass...

chrome/browser/navigation_controller_unittest.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/renderer_host/test_render_view_host.h"
@@ skipping 1045 matching lines @@
 // everything is updated properly. This can be tricky since there is no
 // SiteInstance for the entries created initially.
 TEST_F(NavigationControllerTest, RestoreNavigate) {
   // Create a NavigationController with a restored set of tabs.
   GURL url("http://foo");
   std::vector<TabNavigation> navigations;
   navigations.push_back(TabNavigation(0, url, GURL(),
                                       ASCIIToUTF16("Title"), "state",
                                       PageTransition::LINK));
   NavigationController* our_controller =
-      new NavigationController(profile(), navigations, 0, &rvh_factory_);
+      new NavigationController(profile(), navigations, 0);
   our_controller->GoToIndex(0);
 
   // We should now have one entry, and it should be "pending".
   EXPECT_EQ(1, our_controller->GetEntryCount());
   EXPECT_EQ(our_controller->GetEntryAtIndex(0),
             our_controller->GetPendingEntry());
   EXPECT_EQ(0, our_controller->GetEntryAtIndex(0)->page_id());
 
   // Say we navigated to that entry.
   ViewHostMsg_FrameNavigate_Params params;
@@ skipping 271 matching lines @@
   params.gesture = NavigationGestureAuto;
   params.is_post = false;
   NavigationController::LoadCommittedDetails details;
   EXPECT_FALSE(controller()->RendererDidNavigate(params, &details));
 
   // Nothing should have changed.
   EXPECT_EQ(controller()->GetEntryCount(), 1);
   EXPECT_EQ(controller()->GetLastCommittedEntryIndex(), 0);
 }
 
-/* TODO(brettw) These test pass on my local machine but fail on the buildbot
-   cleaning up the directory after they run. This should be fixed.
-
 // A basic test case. Navigates to a single url, and make sure the history
 // db matches.
 TEST_F(NavigationControllerHistoryTest, Basic) {
   controller()->LoadURL(url0, GURL(), PageTransition::LINK);
   rvh()->SendNavigate(0, url0);
 
   GetLastSession();
 
   session_helper_.AssertSingleWindowWithSingleTab(windows_, 1);
   session_helper_.AssertTabEquals(0, 0, 1, *(windows_[0]->tabs[0]));
   TabNavigation nav1(0, url0, GURL(), string16(),
                      webkit_glue::CreateHistoryStateForURL(url0),
                      PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav1, windows_[0]->tabs[0]->navigations[0]);
 }
 
+/* TODO(brettw) These test pass on my local machine but fail on the buildbot
+   cleaning up the directory after they run. This should be fixed.
+
 // Navigates to three urls, then goes back and make sure the history database
 // is in sync.
 TEST_F(NavigationControllerHistoryTest, NavigationThenBack) {
   rvh()->SendNavigate(0, url0);
   rvh()->SendNavigate(1, url1);
   rvh()->SendNavigate(2, url2);
 
   controller()->GoBack();
   rvh()->SendNavigate(1, url1);
 
@@ skipping 39 matching lines @@
   TabNavigation nav(0, url0, GURL(), string16(),
                     webkit_glue::CreateHistoryStateForURL(url0),
                     PageTransition::LINK);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[0]);
   nav.set_url(url2);
   session_helper_.AssertNavigationEquals(nav,
                                          windows_[0]->tabs[0]->navigations[1]);
 }
 */