More net/ header/implementation method reordering.

(Contains some minor de-inlining.)

BUG=68682
TEST=compiles

Review URL: http://codereview.chromium.org/6263010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72232 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 61 insertions, 59 deletions

diff --git a/net/socket_stream/socket_stream.cc b/net/socket_stream/socket_stream.cc
index e3dc817..b65fa6e 100644
--- a/net/socket_stream/socket_stream.cc
+++ b/net/socket_stream/socket_stream.cc
@@ -39,12 +39,13 @@ static const int kReadBufferSize = 4096;
 namespace net {
 
 SocketStream::ResponseHeaders::ResponseHeaders() : IOBuffer() {}
-SocketStream::ResponseHeaders::~ResponseHeaders() { data_ = NULL; }
 
 void SocketStream::ResponseHeaders::Realloc(size_t new_size) {
   headers_.reset(static_cast<char*>(realloc(headers_.release(), new_size)));
 }
 
+SocketStream::ResponseHeaders::~ResponseHeaders() { data_ = NULL; }
+
 SocketStream::SocketStream(const GURL& url, Delegate* delegate)
     : delegate_(delegate),
       url_(url),
@@ -78,12 +79,6 @@ SocketStream::SocketStream(const GURL& url, Delegate* delegate)
   DCHECK(delegate_);
 }
 
-SocketStream::~SocketStream() {
-  set_context(NULL);
-  DCHECK(!delegate_);
-  DCHECK(!pac_request_);
-}
-
 SocketStream::UserData* SocketStream::GetUserData(
     const void* key) const {
   UserDataMap::const_iterator found = user_data_.find(key);
@@ -96,6 +91,10 @@ void SocketStream::SetUserData(const void* key, UserData* data) {
   user_data_[key] = linked_ptr<UserData>(data);
 }
 
+bool SocketStream::is_secure() const {
+  return url_.SchemeIs("wss");
+}
+
 void SocketStream::set_context(URLRequestContext* context) {
   scoped_refptr<URLRequestContext> prev_context = context_;
 
@@ -200,26 +199,6 @@ void SocketStream::Close() {
       NewRunnableMethod(this, &SocketStream::DoClose));
 }
 
-void SocketStream::DoClose() {
-  closing_ = true;
-  // If next_state_ is STATE_TCP_CONNECT, it's waiting other socket establishing
-  // connection.  If next_state_ is STATE_AUTH_REQUIRED, it's waiting for
-  // restarting.  In these states, we'll close the SocketStream now.
-  if (next_state_ == STATE_TCP_CONNECT || next_state_ == STATE_AUTH_REQUIRED) {
-    DoLoop(ERR_ABORTED);
-    return;
-  }
-  // If next_state_ is STATE_READ_WRITE, we'll run DoLoop and close
-  // the SocketStream.
-  // If it's writing now, we should defer the closing after the current
-  // writing is completed.
-  if (next_state_ == STATE_READ_WRITE && !current_write_buf_)
-    DoLoop(ERR_ABORTED);
-
-  // In other next_state_, we'll wait for callback of other APIs, such as
-  // ResolveProxy().
-}
-
 void SocketStream::RestartWithAuth(
     const string16& username, const string16& password) {
   DCHECK(MessageLoop::current()) <<
@@ -255,6 +234,47 @@ void SocketStream::DetachDelegate() {
   Close();
 }
 
+void SocketStream::SetHostResolver(HostResolver* host_resolver) {
+  DCHECK(host_resolver);
+  host_resolver_ = host_resolver;
+}
+
+void SocketStream::SetClientSocketFactory(
+    ClientSocketFactory* factory) {
+  DCHECK(factory);
+  factory_ = factory;
+}
+
+SocketStream::~SocketStream() {
+  set_context(NULL);
+  DCHECK(!delegate_);
+  DCHECK(!pac_request_);
+}
+
+void SocketStream::CopyAddrInfo(struct addrinfo* head) {
+  addresses_.Copy(head, true);
+}
+
+void SocketStream::DoClose() {
+  closing_ = true;
+  // If next_state_ is STATE_TCP_CONNECT, it's waiting other socket establishing
+  // connection.  If next_state_ is STATE_AUTH_REQUIRED, it's waiting for
+  // restarting.  In these states, we'll close the SocketStream now.
+  if (next_state_ == STATE_TCP_CONNECT || next_state_ == STATE_AUTH_REQUIRED) {
+    DoLoop(ERR_ABORTED);
+    return;
+  }
+  // If next_state_ is STATE_READ_WRITE, we'll run DoLoop and close
+  // the SocketStream.
+  // If it's writing now, we should defer the closing after the current
+  // writing is completed.
+  if (next_state_ == STATE_READ_WRITE && !current_write_buf_)
+    DoLoop(ERR_ABORTED);
+
+  // In other next_state_, we'll wait for callback of other APIs, such as
+  // ResolveProxy().
+}
+
 void SocketStream::Finish(int result) {
   DCHECK(MessageLoop::current()) <<
       "The current MessageLoop must exist";
@@ -277,21 +297,6 @@ void SocketStream::Finish(int result) {
   Release();
 }
 
-void SocketStream::SetHostResolver(HostResolver* host_resolver) {
-  DCHECK(host_resolver);
-  host_resolver_ = host_resolver;
-}
-
-void SocketStream::SetClientSocketFactory(
-    ClientSocketFactory* factory) {
-  DCHECK(factory);
-  factory_ = factory;
-}
-
-void SocketStream::CopyAddrInfo(struct addrinfo* head) {
-  addresses_.Copy(head, true);
-}
-
 int SocketStream::DidEstablishConnection() {
   if (!socket_.get() || !socket_->IsConnected()) {
     next_state_ = STATE_CLOSE;
@@ -1023,10 +1028,6 @@ int SocketStream::HandleCertificateError(int result) {
   return result;
 }
 
-bool SocketStream::is_secure() const {
-  return url_.SchemeIs("wss");
-}
-
 SSLConfigService* SocketStream::ssl_config_service() const {
   return context_->ssl_config_service();
 }
diff --git a/net/socket_stream/socket_stream_metrics.h b/net/socket_stream/socket_stream_metrics.h
index 946a065..66a9ffd 100644
--- a/net/socket_stream/socket_stream_metrics.h
+++ b/net/socket_stream/socket_stream_metrics.h
@@ -18,25 +18,13 @@ namespace net {
 
 class SocketStreamMetrics {
  public:
-  explicit SocketStreamMetrics(const GURL& url);
-  ~SocketStreamMetrics();
-
-  void OnWaitConnection();
-  void OnStartConnection();
-  void OnTunnelProxy();
-  void OnSOCKSProxy();
-  void OnSSLConnection();
-  void OnConnected();
-  void OnRead(int len);
-  void OnWrite(int len);
-  void OnClose();
-
   enum ProtocolType {
     PROTOCOL_UNKNOWN,
     PROTOCOL_WEBSOCKET,
     PROTOCOL_WEBSOCKET_SECURE,
     NUM_PROTOCOL_TYPES,
   };
+
   enum ConnectionType {
     CONNECTION_NONE,
     ALL_CONNECTIONS,
@@ -46,6 +34,19 @@ class SocketStreamMetrics {
     NUM_CONNECTION_TYPES,
   };
 
+  explicit SocketStreamMetrics(const GURL& url);
+  ~SocketStreamMetrics();
+
+  void OnWaitConnection();
+  void OnStartConnection();
+  void OnTunnelProxy();
+  void OnSOCKSProxy();
+  void OnSSLConnection();
+  void OnConnected();
+  void OnRead(int len);
+  void OnWrite(int len);
+  void OnClose();
+
  private:
   void CountProtocolType(ProtocolType protocol_type);
   void CountConnectionType(ConnectionType connection_type);