RefCounted types should not have public destructors, content/browser part 2

content/renderer/devtools_agent_filter.cc

Index: content/renderer/devtools_agent_filter.cc
diff --git a/content/renderer/devtools_agent_filter.cc b/content/renderer/devtools_agent_filter.cc
index 4e42ce3c59afcc5bc1193e336f8a5b6f64919dcd..312e5996c8b635aff4d4233b0c6187d9eafeae56 100644
--- a/content/renderer/devtools_agent_filter.cc
+++ b/content/renderer/devtools_agent_filter.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -21,7 +21,8 @@ class MessageImpl : public WebDevToolsAgent::MessageDescriptor {
  public:
   MessageImpl(const std::string& message, int host_id)
       : msg(message),
-        host_id(host_id) {}
+        host_id(host_id) {
+  }
   virtual ~MessageImpl() {}
   virtual WebDevToolsAgent* agent() {
     DevToolsAgent* agent = DevToolsAgent::FromHostId(host_id);
@@ -35,25 +36,21 @@ class MessageImpl : public WebDevToolsAgent::MessageDescriptor {
   int host_id;
 };
 
-}
+// Made static to allow DevToolsAgent to use it for replying directly
+// from IO thread.
+int g_current_routing_id = 0;
 
-// static
-IPC::Channel* DevToolsAgentFilter::channel_ = NULL;
-// static
-int DevToolsAgentFilter::current_routing_id_ = 0;
+}  // namespace
 
 DevToolsAgentFilter::DevToolsAgentFilter()
     : message_handled_(false),
       render_thread_loop_(MessageLoop::current()) {
 }
 
-DevToolsAgentFilter::~DevToolsAgentFilter() {
-}
-
 bool DevToolsAgentFilter::OnMessageReceived(const IPC::Message& message) {
   // Dispatch debugger commands directly from IO.
   message_handled_ = true;
-  current_routing_id_ = message.routing_id();
+  g_current_routing_id = message.routing_id();
   IPC_BEGIN_MESSAGE_MAP(DevToolsAgentFilter, message)
     IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend,
                         OnDispatchOnInspectorBackend)
@@ -62,9 +59,7 @@ bool DevToolsAgentFilter::OnMessageReceived(const IPC::Message& message) {
   return message_handled_;
 }
 
-void DevToolsAgentFilter::OnFilterAdded(IPC::Channel* channel) {
-  channel_ = channel;
-}
+DevToolsAgentFilter::~DevToolsAgentFilter() {}
 
 void DevToolsAgentFilter::OnDispatchOnInspectorBackend(
     const std::string& message) {
@@ -74,7 +69,7 @@ void DevToolsAgentFilter::OnDispatchOnInspectorBackend(
       return;
   }
   WebDevToolsAgent::interruptAndDispatch(
-      new MessageImpl(message, current_routing_id_));
+      new MessageImpl(message, g_current_routing_id));
 
   render_thread_loop_->PostTask(
       FROM_HERE, base::Bind(&WebDevToolsAgent::processPendingMessages));