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

chrome/browser/tab_contents/navigation_controller.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_NAVIGATION_CONTROLLER_H_
 #define CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_
 
 #include <map>
 
 #include "build/build_config.h"
 
 #include "base/linked_ptr.h"
 #include "base/string16.h"
 #include "googleurl/src/gurl.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ssl/ssl_manager.h"
 #include "chrome/browser/tab_contents/tab_contents_type.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/page_transition_types.h"
 
 class NavigationEntry;
 class GURL;
 class Profile;
-class RenderViewHostFactory;
 class TabContents;
 class SiteInstance;
 class SkBitmap;
 class WebContents;
 class TabContentsCollector;
 class TabNavigation;
 struct ViewHostMsg_FrameNavigate_Params;
 
 // A NavigationController maintains the back-forward list for a single tab and
 // manages all navigation within that list.
@@ skipping 87 matching lines @@
     // Number of items removed.
     int count;
   };
 
   // ---------------------------------------------------------------------------
 
   NavigationController(TabContents* initial_contents, Profile* profile);
 
   // 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
   // registered tabs.  The sequence is as follows:
   // 1. All tabs are asked to Destroy themselves.
   // 2. When each tab is finished Destroying, it will notify the controller.
   // 3. Once all tabs are Destroyed, the NavigationController deletes itself.
   // This ensures that all the TabContents outlive the NavigationController.
   void Destroy();
 
@@ skipping 338 matching lines @@
   void DiscardNonCommittedEntriesInternal();
 
   // Discards the transient entry without updating active_contents_.
   void DiscardTransientEntry();
 
   // ---------------------------------------------------------------------------
 
   // 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_;
 
   // An entry we haven't gotten a response for yet.  This will be discarded
   // when we navigate again.  It's used only so we know what the currently
   // displayed tab is.
   //
   // This may refer to an item in the entries_ list if the pending_entry_index_
   // == -1, or it may be its own entry that should be deleted. Be careful with
@@ skipping 57 matching lines @@
   // when testing.
   static bool check_for_repost_;
 
   // The maximum number of entries that a navigation controller can store.
   static size_t max_entry_count_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationController);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_NAVIGATION_CONTROLLER_H_