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

chrome/browser/tab_contents/render_view_host_manager.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 43 matching lines @@
     // returned pointer will be passed to the caller. If no DOMUI applies,
     // returns NULL.
     virtual DOMUI* CreateDOMUIForRenderManager(const GURL& url) = 0;
 
     // Returns the navigation entry of the current navigation, or NULL if there
     // is none.
     virtual NavigationEntry*
         GetLastCommittedNavigationEntryForRenderManager() = 0;
   };
 
-  // The factory is optional. It is used by unit tests to supply custom render
-  // view hosts. When NULL, the regular RenderViewHost will be created.
-  //
   // Both delegate pointers must be non-NULL and are not owned by this class.
   // They must outlive this class. The RenderViewHostDelegate is what will be
   // installed into all RenderViewHosts that are created.
   //
   // You must call Init() before using this class and Shutdown() before
   // deleting it.
-  RenderViewHostManager(RenderViewHostFactory* render_view_factory,
-                        RenderViewHostDelegate* render_view_delegate,
+  RenderViewHostManager(RenderViewHostDelegate* render_view_delegate,
                         Delegate* delegate);
   ~RenderViewHostManager();
 
   // For arguments, see WebContents constructor.
   void Init(Profile* profile,
             SiteInstance* site_instance,
             int routing_id,
             base::WaitableEvent* modal_dialog_event);
 
   // Schedules all RenderViewHosts for destruction.
   void Shutdown();
 
-  // Returns true if there is a RenderViewHostFactory that will generate
-  // non-standard RenderViewHosts.
-  bool has_render_view_host_factory() const {
-    return !!render_view_factory_;
-  }
-
   // Returns the currently actuive RenderViewHost.
   //
   // This will be non-NULL between Init() and Shutdown(). You may want to NULL
   // check it in many cases, however. Windows can send us messages during the
   // destruction process after it has been shut down.
   RenderViewHost* current_host() const {
     return render_view_host_;
   }
 
   // Returns the view associated with the current RenderViewHost, or NULL if
@@ skipping 103 matching lines @@
   // Returns an appropriate SiteInstance object for the given NavigationEntry,
   // possibly reusing the current SiteInstance.
   // Never called if --process-per-tab is used.
   SiteInstance* GetSiteInstanceForEntry(const NavigationEntry& entry,
                                         SiteInstance* curr_instance);
 
   // Helper method to create a pending RenderViewHost for a cross-site
   // navigation.
   bool CreatePendingRenderView(SiteInstance* instance);
 
-  // Creates a RenderViewHost using render_view_factory_ (or directly, if the
-  // factory is NULL).
-  RenderViewHost* CreateRenderViewHost(SiteInstance* instance,
-                                       int routing_id,
-                                       base::WaitableEvent* modal_dialog_event);
-
   // Sets the pending RenderViewHost/DOMUI to be the active one. Note that this
   // doesn't require the pending render_view_host_ pointer to be non-NULL, since
   // there could be DOM UI switching as well. Call this for every commit.
   void CommitPending();
 
   // Helper method to terminate the pending RenderViewHost.
   void CancelPending();
 
   RenderViewHost* UpdateRendererStateForNavigate(const NavigationEntry& entry);
 
@@ skipping 40 matching lines @@
 };
 
 // The "details" for a NOTIFY_RENDER_VIEW_HOST_CHANGED notification. The old
 // host can be NULL when the first RenderViewHost is set.
 struct RenderViewHostSwitchedDetails {
   RenderViewHost* old_host;
   RenderViewHost* new_host;
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_RENDER_VIEW_HOST_MANAGER_H_