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

chrome/browser/tab_contents/navigation_controller.cc

 // 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.
 
 #include "chrome/browser/tab_contents/navigation_controller.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 130 matching lines @@
   for (std::vector<TabNavigation>::const_iterator i =
            navigations.begin(); i != navigations.end(); ++i, ++page_id) {
     entries->push_back(
         linked_ptr<NavigationEntry>(i->ToNavigationEntry(page_id)));
   }
 }
 
 NavigationController::NavigationController(TabContents* contents,
                                            Profile* profile)
     : profile_(profile),
-      rvh_factory_(NULL),
       pending_entry_(NULL),
       last_committed_entry_index_(-1),
       pending_entry_index_(-1),
       transient_entry_index_(-1),
       active_contents_(contents),
       max_restored_page_id_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this, NULL)),
       needs_reload_(false),
       load_pending_entry_when_active_(false) {
   if (contents)
     RegisterTabContents(contents);
   DCHECK(profile_);
 }
 
 NavigationController::NavigationController(
     Profile* profile,
     const std::vector<TabNavigation>& navigations,
-    int selected_navigation,
-    RenderViewHostFactory* rvh_factory)
+    int selected_navigation)
     : profile_(profile),
-      rvh_factory_(rvh_factory),
       pending_entry_(NULL),
       last_committed_entry_index_(-1),
       pending_entry_index_(-1),
       transient_entry_index_(-1),
       active_contents_(NULL),
       max_restored_page_id_(-1),
       ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this, NULL)),
       needs_reload_(true),
       load_pending_entry_when_active_(false) {
   DCHECK(profile_);
@@ skipping 857 matching lines @@
       NotificationType::NAV_ENTRY_COMMITTED,
       Source<NavigationController>(this),
       Details<LoadCommittedDetails>(details));
 }
 
 TabContents* NavigationController::GetTabContentsCreateIfNecessary(
     const NavigationEntry& entry) {
   TabContents* contents = GetTabContents(entry.tab_type());
   if (!contents) {
     contents = TabContents::CreateWithType(entry.tab_type(), profile_,
-                                           entry.site_instance(), rvh_factory_);
+                                           entry.site_instance());
     if (!contents->AsWebContents()) {
       // Update the max page id, otherwise the newly created TabContents may
       // have reset its max page id resulting in all new navigations. We only
       // do this for non-WebContents as WebContents takes care of this via its
       // SiteInstance. If this creation is the result of a restore, WebContents
       // handles invoking ReservePageIDRange to make sure the renderer's
       // max_page_id is updated to reflect the restored range of page ids.
       int32 max_page_id = contents->GetMaxPageID();
       for (size_t i = 0; i < entries_.size(); ++i) {
         if (entries_[i]->tab_type() == entry.tab_type())
@@ skipping 162 matching lines @@
       return i;
   }
   return -1;
 }
 
 NavigationEntry* NavigationController::GetTransientEntry() const {
   if (transient_entry_index_ == -1)
     return NULL;
   return entries_[transient_entry_index_].get();
 }