Remove a chrome dependency by removing Prerender from ResourceDispatcherHost.

chrome/browser/browser_process_impl.h

 // Copyright (c) 2011 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.
 
 // When each service is created, we set a flag indicating this. At this point,
 // the service initialization could fail or succeed. This allows us to remember
 // if we tried to create a service, and not try creating it over and over if
 // the creation failed.
 
 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
@@ skipping 16 matching lines @@
 #include "content/common/notification_registrar.h"
 #include "ipc/ipc_message.h"
 
 class ChromeNetLog;
 class CommandLine;
 class DevToolsHttpProtocolHandler;
 class DevToolsProtocolHandler;
 class FilePath;
 class NotificationService;
 class PluginDataRemover;
+class ChromeResourceDispatcherHostObserver;

[mmenke, 2011/05/24 17:56:22]

nit:  This should be in alphabetical order.

[dominich, 2011/05/24 18:01:47]

Done.

 class TabCloseableStateWatcher;
 
 // Real implementation of BrowserProcess that creates and returns the services.
 class BrowserProcessImpl : public BrowserProcess,
                            public base::NonThreadSafe,
                            public NotificationObserver {
  public:
   explicit BrowserProcessImpl(const CommandLine& command_line);
   virtual ~BrowserProcessImpl();
 
@@ skipping 57 matching lines @@
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
   virtual void StartAutoupdateTimer();
 #endif
 
   virtual ChromeNetLog* net_log();
 
+  virtual prerender::PrerenderTracker* prerender_tracker();
+
 #if defined(IPC_MESSAGE_LOG_ENABLED)
   virtual void SetIPCLoggingEnabled(bool enable);
 #endif
 
  private:
   void ClearLocalState(const FilePath& profile_path);
   bool ShouldClearLocalState(FilePath* profile_path);
 
   void CreateResourceDispatcherHost();
   void CreateMetricsService();
@@ skipping 145 matching lines @@
   // An event that notifies when we are shutting-down.
   scoped_ptr<base::WaitableEvent> shutdown_event_;
 
   // Ensures that the observers of plugin/print disable/enable state
   // notifications are properly added and removed.
   PrefChangeRegistrar pref_change_registrar_;
 
   // Lives here so can safely log events on shutdown.
   scoped_ptr<ChromeNetLog> net_log_;
 
+  scoped_ptr<prerender::PrerenderTracker> prerender_tracker_;

[cbentzel, 2011/05/24 17:13:54]

You may want to comment that prerender_tracker_ needs to be ordered before
resource_dispatcher_host_observer_ due to destruction ordering.

[dominich, 2011/05/24 18:01:47]

Done.

+
+  scoped_ptr<ChromeResourceDispatcherHostObserver>
+      resource_dispatcher_host_observer_;
+
   NotificationRegistrar notification_registrar_;
   scoped_refptr<PluginDataRemover> plugin_data_remover_;
 
   // Monitors the state of the 'DisablePluginFinder' policy.
   BooleanPrefMember plugin_finder_disabled_pref_;
 
 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
   base::RepeatingTimer<BrowserProcessImpl> autoupdate_timer_;
 
   // Gets called by autoupdate timer to see if browser needs restart and can be
   // restarted, and if that's the case, restarts the browser.
   void OnAutoupdateTimer();
   bool CanAutorestartForUpdate() const;
   void RestartPersistentInstance();
 #endif  // defined(OS_WIN) || defined(OS_LINUX)
 
 #if defined(OS_CHROMEOS)
   scoped_refptr<chromeos::ProxyConfigServiceImpl>
       chromeos_proxy_config_service_impl_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
 };
 
 #endif  // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_