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

content/browser/renderer_host/socket_stream_dispatcher_host.cc

 // 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.
 
 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/socket_stream_host.h"
 #include "content/browser/ssl/ssl_manager.h"
 #include "content/common/resource_messages.h"
@@ skipping 10 matching lines @@
     int render_process_id,
     ResourceMessageFilter::URLRequestContextSelector* selector,
     content::ResourceContext* resource_context)
     : render_process_id_(render_process_id),
       url_request_context_selector_(selector),
       resource_context_(resource_context) {
   DCHECK(selector);
   net::WebSocketJob::EnsureInit();
 }
 
-SocketStreamDispatcherHost::~SocketStreamDispatcherHost() {
-  // TODO(ukai): Implement IDMap::RemoveAll().
-  for (IDMap<SocketStreamHost>::const_iterator iter(&hosts_);
-       !iter.IsAtEnd();
-       iter.Advance()) {
-    int socket_id = iter.GetCurrentKey();
-    const SocketStreamHost* socket_stream_host = iter.GetCurrentValue();
-    delete socket_stream_host;
-    hosts_.Remove(socket_id);
-  }
-}
-
 bool SocketStreamDispatcherHost::OnMessageReceived(const IPC::Message& message,
                                                    bool* message_was_ok) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP_EX(SocketStreamDispatcherHost, message, *message_was_ok)
     IPC_MESSAGE_HANDLER(SocketStreamHostMsg_Connect, OnConnect)
     IPC_MESSAGE_HANDLER(SocketStreamHostMsg_SendData, OnSendData)
     IPC_MESSAGE_HANDLER(SocketStreamHostMsg_Close, OnCloseReq)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;
@@ skipping 108 matching lines @@
     const content::GlobalRequestID& id) {
   int socket_id = id.request_id;
   DVLOG(1) << "SocketStreamDispatcherHost::ContinueSSLRequest socket_id="
            << socket_id;
   DCHECK_NE(content::kNoSocketId, socket_id);
   SocketStreamHost* socket_stream_host = hosts_.Lookup(socket_id);
   DCHECK(socket_stream_host);
   socket_stream_host->ContinueDespiteError();
 }
 
+SocketStreamDispatcherHost::~SocketStreamDispatcherHost() {
+  // TODO(ukai): Implement IDMap::RemoveAll().
+  for (IDMap<SocketStreamHost>::const_iterator iter(&hosts_);
+       !iter.IsAtEnd();
+       iter.Advance()) {
+    int socket_id = iter.GetCurrentKey();
+    const SocketStreamHost* socket_stream_host = iter.GetCurrentValue();
+    delete socket_stream_host;
+    hosts_.Remove(socket_id);
+  }
+}
+
 // Message handlers called by OnMessageReceived.
 void SocketStreamDispatcherHost::OnConnect(int render_view_id,
                                            const GURL& url,
                                            int socket_id) {
   DVLOG(1) << "SocketStreamDispatcherHost::OnConnect"
            << " render_view_id=" << render_view_id
            << " url=" << url
            << " socket_id=" << socket_id;
   DCHECK_NE(content::kNoSocketId, socket_id);
   if (hosts_.Lookup(socket_id)) {
@@ skipping 36 matching lines @@
   hosts_.Remove(socket_id);
   if (!Send(new SocketStreamMsg_Closed(socket_id))) {
     LOG(ERROR) << "SocketStreamMsg_Closed failed.";
   }
 }
 
 net::URLRequestContext* SocketStreamDispatcherHost::GetURLRequestContext() {
   return url_request_context_selector_->GetRequestContext(
       ResourceType::SUB_RESOURCE);
 }