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

chrome/browser/dom_ui/dom_ui_unittest.cc

 // Copyright (c) 2009 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/dom_ui/new_tab_ui.h"
 #include "chrome/browser/renderer_host/test_render_view_host.h"
 #include "chrome/common/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class DOMUITest : public RenderViewHostTestHarness {
@@ skipping 70 matching lines @@
 // Tests that the New Tab Page flags are correctly set and propogated by
 // WebContents when we first navigate to a DOM UI page, then to a standard
 // non-DOM-UI page.
 TEST_F(DOMUITest, DOMUIToStandard) {
   DoNavigationTest(contents(), 1);
 
   // Test the case where we're not doing the initial navigation. This is
   // slightly different than the very-first-navigation case since the
   // SiteInstance will be the same (the original WebContents must still be
   // alive), which will trigger different behavior in RenderViewHostManager.
-  WebContents* contents2 = new TestWebContents(profile_.get(), NULL,
-      &rvh_factory_);
+  WebContents* contents2 = new TestWebContents(profile_.get(), NULL);
   NavigationController* controller2 =
       new NavigationController(contents2, profile_.get());
   contents2->set_controller(controller2);
 
   DoNavigationTest(contents2, 101);
   contents2->CloseContents();
 }
 
 TEST_F(DOMUITest, DOMUIToDOMUI) {
   // Do a load (this state is tested above).
@@ skipping 33 matching lines @@
   // Start a pending load for a DOMUI.
   GURL new_tab_url(chrome::kChromeUINewTabURL);
   controller()->LoadURL(new_tab_url, GURL(), PageTransition::LINK);
   EXPECT_FALSE(contents()->ShouldDisplayURL());
   EXPECT_TRUE(contents()->ShouldDisplayFavIcon());
   EXPECT_FALSE(contents()->IsBookmarkBarAlwaysVisible());
   EXPECT_TRUE(contents()->FocusLocationBarByDefault());
 
   // Committing DOM UI is tested above.
 }