Revert r21117 as it caused reliability failures....

chrome/renderer/render_thread.h

Index: chrome/renderer/render_thread.h
===================================================================
--- chrome/renderer/render_thread.h	(revision 21215)
+++ chrome/renderer/render_thread.h	(working copy)
@@ -20,7 +20,7 @@
 class DevToolsAgentFilter;
 class FilePath;
 class ListValue;
-
+class NotificationService;
 class RenderDnsMaster;
 class RendererHistogram;
 class RendererWebKitClientImpl;
@@ -114,7 +114,9 @@
  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);
@@ -152,15 +154,24 @@
   void EnsureWebKitInitialized();
 
   // These objects live solely on the render thread.
-  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<AppCacheDispatcher> app_cache_dispatcher_;
-  scoped_refptr<DevToolsAgentFilter> devtools_agent_filter_;
+
   scoped_ptr<RendererHistogramSnapshots> histogram_snapshots_;
+
+  scoped_ptr<ScopedRunnableMethodFactory<RenderThread> > cache_stats_factory_;
+
+  scoped_ptr<NotificationService> notification_service_;
+
   scoped_ptr<RendererWebKitClientImpl> webkit_client_;
 
+  scoped_ptr<AppCacheDispatcher> app_cache_dispatcher_;
+
+  scoped_refptr<DevToolsAgentFilter> devtools_agent_filter_;
+
 #if defined(OS_POSIX)
   scoped_refptr<IPC::ChannelProxy::MessageFilter>
       suicide_on_channel_error_filter_;