Unrevert 21355 because the revert might be causing the
worker tests failures.
Review URL: http://codereview.chromium.org/159276
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21412 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 5ced914..d2a1fcd 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -20,7 +20,7 @@
class DevToolsAgentFilter;
class FilePath;
class ListValue;
-class NotificationService;
+
class RenderDnsMaster;
class RendererHistogram;
class RendererWebKitClientImpl;
@@ -114,9 +114,7 @@
private:
virtual void OnControlMessageReceived(const IPC::Message& msg);
- // Called by the thread base class.
- virtual void Init();
- virtual void CleanUp();
+ void Init();
void OnUpdateVisitedLinks(base::SharedMemoryHandle table);
void OnAddVisitedLinks(const VisitedLinkSlave::Fingerprints& fingerprints);
@@ -154,23 +152,14 @@
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<NotificationService> notification_service_;
-
- scoped_ptr<RendererWebKitClientImpl> webkit_client_;
-
+ 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<RendererWebKitClientImpl> webkit_client_;
#if defined(OS_POSIX)
scoped_refptr<IPC::ChannelProxy::MessageFilter>
