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

chrome/browser/tab_contents/web_contents.h

Index: chrome/browser/tab_contents/web_contents.h
===================================================================
--- chrome/browser/tab_contents/web_contents.h	(revision 13136)
+++ chrome/browser/tab_contents/web_contents.h	(working copy)
@@ -42,7 +42,6 @@
 class PluginInstaller;
 class RenderProcessHost;
 class RenderViewHost;
-class RenderViewHostFactory;
 class RenderWidgetHost;
 struct ThumbnailScore;
 struct ViewHostMsg_FrameNavigate_Params;
@@ -75,7 +74,6 @@
   // directly.
   WebContents(Profile* profile,
               SiteInstance* instance,
-              RenderViewHostFactory* render_view_factory,
               int routing_id,
               base::WaitableEvent* modal_dialog_event);
 
@@ -109,8 +107,10 @@
     return view_.get();
   }
 
+#ifdef UNIT_TEST
   // Expose the render manager for testing.
   RenderViewHostManager* render_manager() { return &render_manager_; }
+#endif
 
   // Page state getters & setters ----------------------------------------------
 
@@ -597,9 +597,6 @@
   // Manages creation and swapping of render views.
   RenderViewHostManager render_manager_;
 
-  // For testing, passed to new RenderViewHost managers.
-  RenderViewHostFactory* render_view_factory_;
-
   // Handles print preview and print job for this contents.
   printing::PrintViewManager printing_;