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

net/base/mock_host_resolver.cc

Index: net/base/mock_host_resolver.cc
diff --git a/net/base/mock_host_resolver.cc b/net/base/mock_host_resolver.cc
index a1817a29db443d75e84fc1b5e81eeead9bed645e..dfce49ff36481fb546f5675087553ef9ef9e19a9 100644
--- a/net/base/mock_host_resolver.cc
+++ b/net/base/mock_host_resolver.cc
@@ -45,37 +45,8 @@ int CreateIPAddress(const std::string& host,
 
 }  // namespace
 
-MockHostResolverBase::MockHostResolverBase(bool use_caching)
-    : use_caching_(use_caching) {
-  Reset(NULL);
-}
-
 MockHostResolverBase::~MockHostResolverBase() {}
 
-int MockHostResolverBase::Resolve(const RequestInfo& info,
-                                  AddressList* addresses,
-                                  CompletionCallback* callback,
-                                  RequestHandle* out_req,
-                                  const BoundNetLog& net_log) {
-  if (synchronous_mode_) {
-    callback = NULL;
-    out_req = NULL;
-  }
-  return impl_->Resolve(info, addresses, callback, out_req, net_log);
-}
-
-void MockHostResolverBase::CancelRequest(RequestHandle req) {
-  impl_->CancelRequest(req);
-}
-
-void MockHostResolverBase::AddObserver(Observer* observer) {
-  impl_->AddObserver(observer);
-}
-
-void MockHostResolverBase::RemoveObserver(Observer* observer) {
-  impl_->RemoveObserver(observer);
-}
-
 void MockHostResolverBase::Reset(HostResolverProc* interceptor) {
   synchronous_mode_ = false;
 
@@ -107,6 +78,35 @@ void MockHostResolverBase::Reset(HostResolverProc* interceptor) {
   impl_.reset(new HostResolverImpl(proc, cache, 50u, NULL));
 }
 
+int MockHostResolverBase::Resolve(const RequestInfo& info,
+                                  AddressList* addresses,
+                                  CompletionCallback* callback,
+                                  RequestHandle* out_req,
+                                  const BoundNetLog& net_log) {
+  if (synchronous_mode_) {
+    callback = NULL;
+    out_req = NULL;
+  }
+  return impl_->Resolve(info, addresses, callback, out_req, net_log);
+}
+
+void MockHostResolverBase::CancelRequest(RequestHandle req) {
+  impl_->CancelRequest(req);
+}
+
+void MockHostResolverBase::AddObserver(Observer* observer) {
+  impl_->AddObserver(observer);
+}
+
+void MockHostResolverBase::RemoveObserver(Observer* observer) {
+  impl_->RemoveObserver(observer);
+}
+
+MockHostResolverBase::MockHostResolverBase(bool use_caching)
+    : use_caching_(use_caching) {
+  Reset(NULL);
+}
+
 //-----------------------------------------------------------------------------
 
 struct RuleBasedHostResolverProc::Rule {
@@ -144,9 +144,6 @@ RuleBasedHostResolverProc::RuleBasedHostResolverProc(HostResolverProc* previous)
     : HostResolverProc(previous) {
 }
 
-RuleBasedHostResolverProc::~RuleBasedHostResolverProc() {
-}
-
 void RuleBasedHostResolverProc::AddRule(const std::string& host_pattern,
                                         const std::string& replacement) {
   AddRuleForAddressFamily(host_pattern, ADDRESS_FAMILY_UNSPECIFIED,
@@ -258,6 +255,9 @@ int RuleBasedHostResolverProc::Resolve(const std::string& host,
                               host_resolver_flags, addrlist, os_error);
 }
 
+RuleBasedHostResolverProc::~RuleBasedHostResolverProc() {
+}
+
 //-----------------------------------------------------------------------------
 
 WaitingHostResolverProc::WaitingHostResolverProc(HostResolverProc* previous)