Re-order the declarations in AddressList to comply with style.

(this was a TODO from an earlier refactor).

This is a no-op change, just re-ordering methods.

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

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

2 files changed, 67 insertions, 69 deletions

diff --git a/net/base/address_list.cc b/net/base/address_list.cc
index 70b94b2..8cda64f 100644
--- a/net/base/address_list.cc
+++ b/net/base/address_list.cc
@@ -45,6 +45,18 @@ struct AddressList::Data : public base::RefCountedThreadSafe<Data> {
 AddressList::AddressList() {
 }
 
+AddressList::AddressList(const AddressList& addresslist)
+    : data_(addresslist.data_) {
+}
+
+AddressList::~AddressList() {
+}
+
+AddressList& AddressList::operator=(const AddressList& addresslist) {
+  data_ = addresslist.data_;
+  return *this;
+}
+
 // static
 AddressList AddressList::CreateFromIPAddress(
       const IPAddressNumber& address,
@@ -102,17 +114,6 @@ AddressList AddressList::CreateFromIPAddressWithCname(
   return AddressList(new Data(ai, false /*is_system_created*/));
 }
 
-AddressList::AddressList(const AddressList& addresslist)
-    : data_(addresslist.data_) {
-}
-
-AddressList::~AddressList() {
-}
-
-AddressList& AddressList::operator=(const AddressList& addresslist) {
-  data_ = addresslist.data_;
-  return *this;
-}
 
 // static
 AddressList AddressList::CreateByAdoptingFromSystem(struct addrinfo* head) {
@@ -132,6 +133,47 @@ AddressList AddressList::CreateByCopyingFirstAddress(
                               false /*is_system_created*/));
 }
 
+// static
+AddressList AddressList::CreateFromSockaddr(
+    const struct sockaddr* address,
+    socklen_t address_length,
+    int socket_type,
+    int protocol) {
+  // Do sanity checking on socket_type and protocol.
+  DCHECK(socket_type == SOCK_DGRAM || socket_type == SOCK_STREAM);
+  DCHECK(protocol == IPPROTO_TCP || protocol == IPPROTO_UDP);
+
+  struct addrinfo* ai = new addrinfo;
+  memset(ai, 0, sizeof(addrinfo));
+  switch (address_length) {
+    case sizeof(struct sockaddr_in):
+      {
+        const struct sockaddr_in* sin =
+            reinterpret_cast<const struct sockaddr_in*>(address);
+        ai->ai_family = sin->sin_family;
+        DCHECK_EQ(AF_INET, ai->ai_family);
+      }
+      break;
+    case sizeof(struct sockaddr_in6):
+      {
+        const struct sockaddr_in6* sin6 =
+            reinterpret_cast<const struct sockaddr_in6*>(address);
+        ai->ai_family = sin6->sin6_family;
+        DCHECK_EQ(AF_INET6, ai->ai_family);
+      }
+      break;
+    default:
+      NOTREACHED() << "Bad IP address";
+      break;
+  }
+  ai->ai_socktype = socket_type;
+  ai->ai_protocol = protocol;
+  ai->ai_addrlen = address_length;
+  ai->ai_addr = reinterpret_cast<struct sockaddr*>(new char[address_length]);
+  memcpy(ai->ai_addr, address, address_length);
+  return AddressList(new Data(ai, false /*is_system_created*/));
+}
+
 void AddressList::Append(const struct addrinfo* head) {
   DCHECK(head);
   // Always create a copy, since the Data might be shared across instances.
@@ -184,48 +226,6 @@ const struct addrinfo* AddressList::head() const {
 
 AddressList::AddressList(Data* data) : data_(data) {}
 
-// static
-AddressList AddressList::CreateFromSockaddr(
-    const struct sockaddr* address,
-    socklen_t address_length,
-    int socket_type,
-    int protocol) {
-  // Do sanity checking on socket_type and protocol.
-  DCHECK(socket_type == SOCK_DGRAM || socket_type == SOCK_STREAM);
-  DCHECK(protocol == IPPROTO_TCP || protocol == IPPROTO_UDP);
-
-  struct addrinfo* ai = new addrinfo;
-  memset(ai, 0, sizeof(addrinfo));
-  switch (address_length) {
-    case sizeof(struct sockaddr_in):
-      {
-        const struct sockaddr_in* sin =
-            reinterpret_cast<const struct sockaddr_in*>(address);
-        ai->ai_family = sin->sin_family;
-        DCHECK_EQ(AF_INET, ai->ai_family);
-      }
-      break;
-    case sizeof(struct sockaddr_in6):
-      {
-        const struct sockaddr_in6* sin6 =
-            reinterpret_cast<const struct sockaddr_in6*>(address);
-        ai->ai_family = sin6->sin6_family;
-        DCHECK_EQ(AF_INET6, ai->ai_family);
-      }
-      break;
-    default:
-      NOTREACHED() << "Bad IP address";
-      break;
-  }
-  ai->ai_socktype = socket_type;
-  ai->ai_protocol = protocol;
-  ai->ai_addrlen = address_length;
-  ai->ai_addr = reinterpret_cast<struct sockaddr*>(new char[address_length]);
-  memcpy(ai->ai_addr, address, address_length);
-  return AddressList(new Data(ai, false /*is_system_created*/));
-}
-
-
 AddressList::Data::Data(struct addrinfo* ai, bool is_system_created)
     : head(ai), is_system_created(is_system_created) {
   DCHECK(head);
diff --git a/net/base/address_list.h b/net/base/address_list.h
index 1ac4e0e..eb78653 100644
--- a/net/base/address_list.h
+++ b/net/base/address_list.h
@@ -11,8 +11,6 @@
 #include "base/memory/ref_counted.h"
 #include "net/base/net_util.h"
 
-// TODO(eroman): Fix the declaration + definition ordering to match style guide.
-
 struct addrinfo;
 
 namespace net {
@@ -25,6 +23,10 @@ class AddressList {
   // other than assignment.
   AddressList();
 
+  AddressList(const AddressList& addresslist);
+  ~AddressList();
+  AddressList& operator=(const AddressList& addresslist);
+
   // Creates an address list for a single IP literal.
   static AddressList CreateFromIPAddress(
       const IPAddressNumber& address,
@@ -38,10 +40,6 @@ class AddressList {
       uint16 port,
       bool canonicalize_name);
 
-  AddressList(const AddressList& addresslist);
-  ~AddressList();
-  AddressList& operator=(const AddressList& addresslist);
-
   // Adopts the given addrinfo list (assumed to have been created by
   // the system, e.g. returned by getaddrinfo()) in place of the
   // existing one if any.  This hands over responsibility for freeing
@@ -56,6 +54,16 @@ class AddressList {
   // are other addresses in |head| they will be ignored.
   static AddressList CreateByCopyingFirstAddress(const struct addrinfo* head);
 
+  // Creates an address list for a single socket address.
+  // |address| the sockaddr to copy.
+  // |socket_type| is either SOCK_STREAM or SOCK_DGRAM.
+  // |protocol| is either IPPROTO_TCP or IPPROTO_UDP.
+  static AddressList CreateFromSockaddr(
+      const struct sockaddr* address,
+      socklen_t address_length,
+      int socket_type,
+      int protocol);
+
   // Appends a copy of |head| and all its linked addrinfos to the stored
   // addrinfo. Note that this will cause a reallocation of the linked list,
   // which invalidates the head pointer.
@@ -89,16 +97,6 @@ class AddressList {
   //            value of head() across such calls.
   const struct addrinfo* head() const;
 
-  // Creates an address list for a single socket address.
-  // |address| the sockaddr to copy.
-  // |socket_type| is either SOCK_STREAM or SOCK_DGRAM.
-  // |protocol| is either IPPROTO_TCP or IPPROTO_UDP.
-  static AddressList CreateFromSockaddr(
-      const struct sockaddr* address,
-      socklen_t address_length,
-      int socket_type,
-      int protocol);
-
  private:
   struct Data;