| Index: net/http/http_auth_handler_mock.cc
|
| ===================================================================
|
| --- net/http/http_auth_handler_mock.cc (revision 54613)
|
| +++ net/http/http_auth_handler_mock.cc (working copy)
|
| @@ -6,7 +6,6 @@
|
|
|
| #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 {
|
| @@ -83,7 +82,6 @@
|
| 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);
|
| @@ -120,14 +118,6 @@
|
| 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);
|
| @@ -144,11 +134,7 @@
|
| 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;
|
| }
|
|
|
|
|