Revert 54528 - Digest authentication uses a uri field to prevent replay attac...

net/http/http_auth_handler_mock.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_handler_mock.h"
 
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
-#include "net/http/http_request_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 HttpAuthHandlerMock::HttpAuthHandlerMock()
   : resolve_(RESOLVE_INIT), user_callback_(NULL),
     ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
     generate_async_(false), generate_rv_(OK),
     auth_token_(NULL),
     first_round_(true),
@@ skipping 56 matching lines @@
   properties_ = connection_based_ ? IS_CONNECTION_BASED : 0;
   return true;
 }
 
 int HttpAuthHandlerMock::GenerateAuthTokenImpl(const string16* username,
                                                const string16* password,
                                                const HttpRequestInfo* request,
                                                CompletionCallback* callback,
                                                std::string* auth_token) {
   first_round_ = false;
-  request_url_ = request->url;
   if (generate_async_) {
     EXPECT_TRUE(user_callback_ == NULL);
     EXPECT_TRUE(auth_token_ == NULL);
     user_callback_ = callback;
     auth_token_ = auth_token;
     MessageLoop::current()->PostTask(
         FROM_HERE, method_factory_.NewRunnableMethod(
             &HttpAuthHandlerMock::OnGenerateAuthToken));
     return ERR_IO_PENDING;
   } else {
@@ skipping 16 matching lines @@
   EXPECT_TRUE(generate_async_);
   EXPECT_TRUE(user_callback_ != NULL);
   if (generate_rv_ == OK)
     *auth_token_ = "auth_token";
   auth_token_ = NULL;
   CompletionCallback* callback = user_callback_;
   user_callback_ = NULL;
   callback->Run(generate_rv_);
 }
 
-HttpAuthHandlerMock::Factory::Factory()
-    : do_init_from_challenge_(false) {
-  // TODO(cbentzel): Default do_init_from_challenge_ to true.
-}
-
-HttpAuthHandlerMock::Factory::~Factory() {
-}
-
 void HttpAuthHandlerMock::Factory::set_mock_handler(
     HttpAuthHandler* handler, HttpAuth::Target target) {
   EXPECT_TRUE(handlers_[target].get() == NULL);
   handlers_[target].reset(handler);
 }
 
 int HttpAuthHandlerMock::Factory::CreateAuthHandler(
     HttpAuth::ChallengeTokenizer* challenge,
     HttpAuth::Target target,
     const GURL& origin,
     CreateReason reason,
     int nonce_count,
     const BoundNetLog& net_log,
     scoped_ptr<HttpAuthHandler>* handler) {
   if (!handlers_[target].get())
     return ERR_UNEXPECTED;
-  scoped_ptr<HttpAuthHandler> tmp_handler(handlers_[target].release());
-  if (do_init_from_challenge_ &&
-      !tmp_handler->InitFromChallenge(challenge, target, origin, net_log))
-    return ERR_INVALID_RESPONSE;
-  handler->swap(tmp_handler);
+  handler->swap(handlers_[target]);
   return OK;
 }
 
 }  // namespace net