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

net/http/http_auth.cc

 // 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.
 
 #include "net/http/http_auth.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
@@ skipping 69 matching lines @@
     authorization_result = handler->HandleAnotherChallenge(&props);
     if (authorization_result != HttpAuth::AUTHORIZATION_RESULT_INVALID) {
       *challenge_used = challenge;
       return authorization_result;
     }
   }
   // Finding no matches is equivalent to rejection.
   return HttpAuth::AUTHORIZATION_RESULT_REJECT;
 }
 
+HttpUtil::NameValuePairsIterator HttpAuth::ChallengeTokenizer::param_pairs()
+    const {
+  return HttpUtil::NameValuePairsIterator(params_begin_, params_end_, ',');
+}
+
+std::string HttpAuth::ChallengeTokenizer::base64_param() const {
+  // Strip off any padding.
+  // (See https://bugzilla.mozilla.org/show_bug.cgi?id=230351.)
+  //
+  // Our base64 decoder requires that the length be a multiple of 4.
+  int encoded_length = params_end_ - params_begin_;
+  while (encoded_length > 0 && encoded_length % 4 != 0 &&
+         params_begin_[encoded_length - 1] == '=') {
+    --encoded_length;
+  }
+  return std::string(params_begin_, params_begin_ + encoded_length);
+}
+
 void HttpAuth::ChallengeTokenizer::Init(std::string::const_iterator begin,
                                         std::string::const_iterator end) {
   // The first space-separated token is the auth-scheme.
   // NOTE: we are more permissive than RFC 2617 which says auth-scheme
   // is separated by 1*SP.
   StringTokenizer tok(begin, end, HTTP_LWS);
   if (!tok.GetNext()) {
     // Default param and scheme iterators provide empty strings
     return;
   }
 
   // Save the scheme's position.
   scheme_begin_ = tok.token_begin();
   scheme_end_ = tok.token_end();
 
   params_begin_ = scheme_end_;
   params_end_ = end;
   HttpUtil::TrimLWS(&params_begin_, &params_end_);
 }
 
-HttpUtil::NameValuePairsIterator HttpAuth::ChallengeTokenizer::param_pairs()
-    const {
-  return HttpUtil::NameValuePairsIterator(params_begin_, params_end_, ',');
-}
-
-std::string HttpAuth::ChallengeTokenizer::base64_param() const {
-  // Strip off any padding.
-  // (See https://bugzilla.mozilla.org/show_bug.cgi?id=230351.)
-  //
-  // Our base64 decoder requires that the length be a multiple of 4.
-  int encoded_length = params_end_ - params_begin_;
-  while (encoded_length > 0 && encoded_length % 4 != 0 &&
-         params_begin_[encoded_length - 1] == '=') {
-    --encoded_length;
-  }
-  return std::string(params_begin_, params_begin_ + encoded_length);
-}
-
 // static
 std::string HttpAuth::GetChallengeHeaderName(Target target) {
   switch (target) {
     case AUTH_PROXY:
       return "Proxy-Authenticate";
     case AUTH_SERVER:
       return "WWW-Authenticate";
     default:
       NOTREACHED();
       return "";
@@ skipping 38 matching lines @@
   COMPILE_ASSERT(arraysize(kSchemeNames) == AUTH_SCHEME_MAX,
                  http_auth_scheme_names_incorrect_size);
   if (scheme < AUTH_SCHEME_BASIC || scheme >= AUTH_SCHEME_MAX) {
     NOTREACHED();
     return "invalid_scheme";
   }
   return kSchemeNames[scheme];
 }
 
 }  // namespace net