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

chrome/browser/tab_contents/test_web_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TEST_WEB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TEST_WEB_CONTENTS_H_
 
 #include "chrome/browser/tab_contents/web_contents.h"
 
 class RenderViewHostFactory;
 class TestRenderViewHost;
 
 // Subclass WebContents to ensure it creates TestRenderViewHosts and does
 // not do anything involving views.
 class TestWebContents : public WebContents {
  public:
   // The render view host factory will be passed on to the
-  TestWebContents(Profile* profile, SiteInstance* instance,
-                  RenderViewHostFactory* rvh_factory);
+  TestWebContents(Profile* profile, SiteInstance* instance);
 
   TestRenderViewHost* pending_rvh();
 
   // State accessor.
   bool cross_navigation_pending() {
     return render_manager_.cross_navigation_pending_;
   }
 
   // Overrides WebContents::ShouldTransitionCrossSite so that we can test both
   // alternatives without using command-line switches.
@@ skipping 16 matching lines @@
     render_view_host->CreateRenderView();
     return true;
   }
   void UpdateRenderViewSizeForRenderManager() {}
 
   // Set by individual tests.
   bool transition_cross_site;
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TEST_WEB_CONTENTS_H_