[net/http auth] Cleanup. Method names, and constness.

net/http/http_auth_handler_basic_unittest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 25 matching lines @@
   for (size_t i = 0; i < arraysize(tests); ++i) {
     std::string challenge = "Basic realm=\"Atlantis\"";
     scoped_ptr<HttpAuthHandler> basic;
     EXPECT_EQ(OK, factory.CreateAuthHandlerFromString(
         challenge, HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &basic));
     AuthCredentials credentials(base::ASCIIToUTF16(tests[i].username),
                                 base::ASCIIToUTF16(tests[i].password));
     HttpRequestInfo request_info;
     std::string auth_token;
     TestCompletionCallback callback;
-    int rv = basic->GenerateAuthToken(&credentials, &request_info,
+    int rv = basic->GenerateAuthToken(&credentials, request_info,
                                       callback.callback(), &auth_token);
     EXPECT_EQ(OK, rv);
     EXPECT_STREQ(tests[i].expected_credentials, auth_token.c_str());
   }
 }
 
 TEST(HttpAuthHandlerBasicTest, HandleAnotherChallenge) {
   static const struct {
     const char* challenge;
     HttpAuth::AuthorizationResult expected_rv;
@@ skipping 32 matching lines @@
   HttpAuthHandlerBasic::Factory factory;
   scoped_ptr<HttpAuthHandler> basic;
   EXPECT_EQ(OK, factory.CreateAuthHandlerFromString(
       tests[0].challenge, HttpAuth::AUTH_SERVER, origin,
       BoundNetLog(), &basic));
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     std::string challenge(tests[i].challenge);
     HttpAuthChallengeTokenizer tok(challenge.begin(),
                                    challenge.end());
-    EXPECT_EQ(tests[i].expected_rv, basic->HandleAnotherChallenge(&tok));
+    EXPECT_EQ(tests[i].expected_rv, basic->HandleAnotherChallenge(tok));
   }
 }
 
-TEST(HttpAuthHandlerBasicTest, InitFromChallenge) {
+TEST(HttpAuthHandlerBasicTest, HandleInitialChallenge) {
   static const struct {
     const char* challenge;
     int expected_rv;
     const char* expected_realm;
   } tests[] = {
     // No realm (we allow this even though realm is supposed to be required
     // according to RFC 2617.)
     {
       "Basic",
       OK,
@@ skipping 76 matching lines @@
     scoped_ptr<HttpAuthHandler> basic;
     int rv = factory.CreateAuthHandlerFromString(
         challenge, HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &basic);
     EXPECT_EQ(tests[i].expected_rv, rv);
     if (rv == OK)
       EXPECT_EQ(tests[i].expected_realm, basic->realm());
   }
 }
 
 }  // namespace net