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

a factory pointer around all the time. Removing TestTabContents will require
making the Browser object keep track of the Factory pointer as well, so I think
the global is the best approach and cleans some things up.
Review URL: http://codereview.chromium.org/62044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13255 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 9 deletions

diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index 2d1364f..04160dc 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -21,7 +21,6 @@
 class NavigationEntry;
 class GURL;
 class Profile;
-class RenderViewHostFactory;
 class TabContents;
 class SiteInstance;
 class SkBitmap;
@@ -129,13 +128,11 @@ class NavigationController {
 
   // Creates a NavigationController from the specified history. Processing
   // for this is asynchronous and handled via the RestoreHelper (in
-  // navigation_controller.cc). The RenderViewHostFactory will be passed to
-  // new TabContentses, it is non-NULL only for testing.
+  // navigation_controller.cc).
   NavigationController(
       Profile* profile,
       const std::vector<TabNavigation>& navigations,
-      int selected_navigation,
-      RenderViewHostFactory* rvh_factory);
+      int selected_navigation);
   ~NavigationController();
 
   // Begin the destruction sequence for this NavigationController and all its
@@ -494,10 +491,6 @@ class NavigationController {
   // The user profile associated with this controller
   Profile* profile_;
 
-  // Non-owning pointer to the factory to pass to new TabContentes. This will be
-  // NULL except in testing, where it is used to create mock RVH's.
-  RenderViewHostFactory* rvh_factory_;
-
   // List of NavigationEntry for this tab
   typedef std::vector<linked_ptr<NavigationEntry> > NavigationEntries;
   NavigationEntries entries_;