Revert r21117 as it caused reliability failures....

chrome/renderer/render_thread.h

 // Copyright (c) 2009 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_RENDERER_RENDER_THREAD_H_
 #define CHROME_RENDERER_RENDER_THREAD_H_
 
 #include <string>
 #include <vector>
 
 #include "base/gfx/native_widget_types.h"
 #include "base/shared_memory.h"
 #include "base/task.h"
 #include "build/build_config.h"
 #include "chrome/common/child_thread.h"
 #include "chrome/renderer/renderer_histogram_snapshots.h"
 #include "chrome/renderer/visitedlink_slave.h"
 
 class AppCacheDispatcher;
 class DevToolsAgentFilter;
 class FilePath;
 class ListValue;
-
+class NotificationService;
 class RenderDnsMaster;
 class RendererHistogram;
 class RendererWebKitClientImpl;
 class SkBitmap;
 class UserScriptSlave;
 struct ModalDialogEvent;
 struct RendererPreferences;
 struct WebPreferences;
 
 // The RenderThreadBase is the minimal interface that a RenderView/Widget
@@ skipping 73 matching lines @@
 
   // Sends a message to the browser to close all idle connections.
   void CloseIdleConnections();
 
   // Sends a message to the browser to enable or disable the disk cache.
   void SetCacheMode(bool enabled);
 
  private:
   virtual void OnControlMessageReceived(const IPC::Message& msg);
 
-  void Init();
+  // Called by the thread base class.
+  virtual void Init();
+  virtual void CleanUp();
 
   void OnUpdateVisitedLinks(base::SharedMemoryHandle table);
   void OnAddVisitedLinks(const VisitedLinkSlave::Fingerprints& fingerprints);
   void OnResetVisitedLinks();
 
   void OnUpdateUserScripts(base::SharedMemoryHandle table);
   void OnSetExtensionFunctionNames(const std::vector<std::string>& names);
   void OnPageActionsUpdated(const std::string& extension_id,
                             const std::vector<std::string>& page_actions);
   void OnSetNextPageID(int32 next_page_id);
@@ skipping 17 matching lines @@
 
   // Gather usage statistics from the in-memory cache and inform our host.
   // These functions should be call periodically so that the host can make
   // decisions about how to allocation resources using current information.
   void InformHostOfCacheStats();
 
   // We initialize WebKit as late as possible.
   void EnsureWebKitInitialized();
 
   // These objects live solely on the render thread.
+  scoped_ptr<VisitedLinkSlave> visited_link_slave_;
+
+  scoped_ptr<UserScriptSlave> user_script_slave_;
+
+  scoped_ptr<RenderDnsMaster> dns_master_;
+
+  scoped_ptr<RendererHistogramSnapshots> histogram_snapshots_;
+
   scoped_ptr<ScopedRunnableMethodFactory<RenderThread> > cache_stats_factory_;
-  scoped_ptr<VisitedLinkSlave> visited_link_slave_;
-  scoped_ptr<UserScriptSlave> user_script_slave_;
-  scoped_ptr<RenderDnsMaster> dns_master_;
+
+  scoped_ptr<NotificationService> notification_service_;
+
+  scoped_ptr<RendererWebKitClientImpl> webkit_client_;
+
   scoped_ptr<AppCacheDispatcher> app_cache_dispatcher_;
+
   scoped_refptr<DevToolsAgentFilter> devtools_agent_filter_;
-  scoped_ptr<RendererHistogramSnapshots> histogram_snapshots_;
-  scoped_ptr<RendererWebKitClientImpl> webkit_client_;
 
 #if defined(OS_POSIX)
   scoped_refptr<IPC::ChannelProxy::MessageFilter>
       suicide_on_channel_error_filter_;
 #endif
 
   // If true, then a GetPlugins call is allowed to rescan the disk.
   bool plugin_refresh_allowed_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThread);
 };
 
 #endif  // CHROME_RENDERER_RENDER_THREAD_H_