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

chrome/browser/tab_contents/web_contents.h

 // Copyright (c) 2006-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_WEB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 24 matching lines @@
 
 class AutofillForm;
 class AutofillManager;
 class DOMUI;
 class InterstitialPageDelegate;
 class LoadNotificationDetails;
 class PasswordManager;
 class PluginInstaller;
 class RenderProcessHost;
 class RenderViewHost;
-class RenderViewHostFactory;
 class RenderWidgetHost;
 struct ThumbnailScore;
 struct ViewHostMsg_FrameNavigate_Params;
 struct ViewHostMsg_DidPrintPage_Params;
 class WebContentsView;
 
 namespace base {
 class WaitableEvent;
 }
 
@@ skipping 12 matching lines @@
                     public RenderViewHostManager::Delegate,
                     public SelectFileDialog::Listener {
  public:
   // If instance is NULL, then creates a new process for this view.  Otherwise
   // initialize with a process already created for a different WebContents.
   // This will share the process between views in the same instance.  If
   // render_view_factory is NULL, this will create RenderViewHost objects
   // directly.
   WebContents(Profile* profile,
               SiteInstance* instance,
-              RenderViewHostFactory* render_view_factory,
               int routing_id,
               base::WaitableEvent* modal_dialog_event);
 
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Getters -------------------------------------------------------------------
 
   // Returns the AutofillManager, creating it if necessary.
   AutofillManager* GetAutofillManager();
 
@@ skipping 13 matching lines @@
   }
   RenderViewHost* render_view_host() const {
     return render_manager_.current_host();
   }
 
   // The WebContentsView will never change and is guaranteed non-NULL.
   WebContentsView* view() const {
     return view_.get();
   }
 
+#ifdef UNIT_TEST
   // Expose the render manager for testing.
   RenderViewHostManager* render_manager() { return &render_manager_; }
+#endif
 
   // Page state getters & setters ----------------------------------------------
 
   bool is_starred() const { return is_starred_; }
 
   const std::wstring& encoding() const { return encoding_; }
   void set_encoding(const std::wstring& encoding) {
     encoding_ = encoding;
   }
 
@@ skipping 466 matching lines @@
   DOMUI* GetDOMUIForCurrentState();
 
   // Data ----------------------------------------------------------------------
 
   // The corresponding view.
   scoped_ptr<WebContentsView> view_;
 
   // 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_;
 
   // Indicates whether we should notify about disconnection of this
   // WebContents. This is used to ensure disconnection notifications only
   // happen if a connection notification has happened and that they happen only
   // once.
   bool notify_disconnection_;
 
   // Maps from handle to page_id.
@@ skipping 90 matching lines @@
 
   // The last find result. This object contains details about the number of
   // matches, the find selection rectangle, etc. The UI can access this
   // information to build its presentation.
   FindNotificationDetails find_result_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_H_