Even more reordering the methods in headers and implementation in net/.

net/base/host_resolver_impl.h

 // Copyright (c) 2010 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.
 
 #ifndef NET_BASE_HOST_RESOLVER_IMPL_H_
 #define NET_BASE_HOST_RESOLVER_IMPL_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 69 matching lines @@
   HostResolverImpl(HostResolverProc* resolver_proc,
                    HostCache* cache,
                    size_t max_jobs,
                    NetLog* net_log);
 
   // If any completion callbacks are pending when the resolver is destroyed,
   // the host resolutions are cancelled, and the completion callbacks will not
   // be called.
   virtual ~HostResolverImpl();
 
-  // HostResolver methods:
-  virtual int Resolve(const RequestInfo& info,
-                      AddressList* addresses,
-                      CompletionCallback* callback,
-                      RequestHandle* out_req,
-                      const BoundNetLog& source_net_log);
-  virtual void CancelRequest(RequestHandle req);
-  virtual void AddObserver(HostResolver::Observer* observer);
-  virtual void RemoveObserver(HostResolver::Observer* observer);
-
-  // Set address family, and disable IPv6 probe support.
-  virtual void SetDefaultAddressFamily(AddressFamily address_family);
-  virtual AddressFamily GetDefaultAddressFamily() const;
-
   // Continuously observe whether IPv6 is supported, and set the allowable
   // address family to IPv4 iff IPv6 is not supported.
   void ProbeIPv6Support();
 
-  virtual HostResolverImpl* GetAsHostResolverImpl();
-
-  // TODO(eroman): hack for http://crbug.com/15513
-  virtual void Shutdown();
-
   // Returns the cache this resolver uses, or NULL if caching is disabled.
   HostCache* cache() { return cache_.get(); }
 
   // Applies a set of constraints for requests that belong to the specified
   // pool. NOTE: Don't call this after requests have been already been started.
   //
   //  |pool_index| -- Specifies which pool these constraints should be applied
   //                  to.
   //  |max_outstanding_jobs| -- How many concurrent jobs are allowed for this
   //                            pool.
   //  |max_pending_requests| -- How many requests can be enqueued for this pool
   //                            before we start dropping requests. Dropped
   //                            requests fail with
   //                            ERR_HOST_RESOLVER_QUEUE_TOO_LARGE.
   void SetPoolConstraints(JobPoolIndex pool_index,
                           size_t max_outstanding_jobs,
                           size_t max_pending_requests);
 
+  // HostResolver methods:
+  virtual int Resolve(const RequestInfo& info,
+                      AddressList* addresses,
+                      CompletionCallback* callback,
+                      RequestHandle* out_req,
+                      const BoundNetLog& source_net_log);
+  virtual void CancelRequest(RequestHandle req);
+  virtual void AddObserver(HostResolver::Observer* observer);
+  virtual void RemoveObserver(HostResolver::Observer* observer);
+
+  // Set address family, and disable IPv6 probe support.
+  virtual void SetDefaultAddressFamily(AddressFamily address_family);
+  virtual AddressFamily GetDefaultAddressFamily() const;
+
+  virtual HostResolverImpl* GetAsHostResolverImpl();
+
+  // TODO(eroman): hack for http://crbug.com/15513
+  virtual void Shutdown();
+
  private:
   class Job;
   class JobPool;
   class IPv6ProbeJob;
   class Request;
   typedef std::vector<Request*> RequestsList;
   typedef HostCache::Key Key;
   typedef std::map<Key, scoped_refptr<Job> > JobMap;
   typedef std::vector<HostResolver::Observer*> ObserversList;
 
@@ skipping 37 matching lines @@
                        const RequestInfo& info,
                        int net_error,
                        int os_error);
 
   // Called when a request has been cancelled.
   void OnCancelRequest(const BoundNetLog& source_net_log,
                        const BoundNetLog& request_net_log,
                        int request_id,
                        const RequestInfo& info);
 
-  // NetworkChangeNotifier::Observer methods:
-  virtual void OnIPAddressChanged();
-
   // Notify IPv6ProbeJob not to call back, and discard reference to the job.
   void DiscardIPv6ProbeJob();
 
   // Callback from IPv6 probe activity.
   void IPv6ProbeSetDefaultAddressFamily(AddressFamily address_family);
 
   // Returns true if the constraints for |pool| are met, and a new job can be
   // created for this pool.
   bool CanCreateJobForPool(const JobPool& pool) const;
 
@@ skipping 18 matching lines @@
 
   // Adds a pending request |req| to |pool|.
   int EnqueueRequest(JobPool* pool, Request* req);
 
   // Cancels all jobs.
   void CancelAllJobs();
 
   // Aborts all in progress jobs (but might start new ones).
   void AbortAllInProgressJobs();
 
+  // NetworkChangeNotifier::Observer methods:
+  virtual void OnIPAddressChanged();
+
   // Cache of host resolution results.
   scoped_ptr<HostCache> cache_;
 
   // Map from hostname to outstanding job.
   JobMap jobs_;
 
   // Maximum number of concurrent jobs allowed, across all pools.
   size_t max_jobs_;
 
   // The information to track pending requests for a JobPool, as well as
@@ skipping 37 matching lines @@
   HostResolverFlags additional_resolver_flags_;
 
   NetLog* net_log_;
 
   DISALLOW_COPY_AND_ASSIGN(HostResolverImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_HOST_RESOLVER_IMPL_H_