diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/net/http/http_auth_handler_mock.cc | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
| download | qtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/net/http/http_auth_handler_mock.cc')
| -rw-r--r-- | chromium/net/http/http_auth_handler_mock.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chromium/net/http/http_auth_handler_mock.cc b/chromium/net/http/http_auth_handler_mock.cc index 35ed3abe354..f800c192ac4 100644 --- a/chromium/net/http/http_auth_handler_mock.cc +++ b/chromium/net/http/http_auth_handler_mock.cc @@ -5,8 +5,10 @@ #include "net/http/http_auth_handler_mock.h" #include "base/bind.h" -#include "base/message_loop/message_loop.h" +#include "base/location.h" +#include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" +#include "base/thread_task_runner_handle.h" #include "net/base/net_errors.h" #include "net/http/http_auth_challenge_tokenizer.h" #include "net/http/http_request_info.h" @@ -60,10 +62,9 @@ int HttpAuthHandlerMock::ResolveCanonicalName( EXPECT_TRUE(callback_.is_null()); rv = ERR_IO_PENDING; callback_ = callback; - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&HttpAuthHandlerMock::OnResolveCanonicalName, - weak_factory_.GetWeakPtr())); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(&HttpAuthHandlerMock::OnResolveCanonicalName, + weak_factory_.GetWeakPtr())); break; default: NOTREACHED(); @@ -83,7 +84,7 @@ HttpAuth::AuthorizationResult HttpAuthHandlerMock::HandleAnotherChallenge( // challenge for a non connection based scheme, assume it's a rejection. if (!is_connection_based() || challenge->base64_param().empty()) return HttpAuth::AUTHORIZATION_RESULT_REJECT; - if (!LowerCaseEqualsASCII(challenge->scheme(), "mock")) + if (!base::LowerCaseEqualsASCII(challenge->scheme(), "mock")) return HttpAuth::AUTHORIZATION_RESULT_INVALID; return HttpAuth::AUTHORIZATION_RESULT_ACCEPT; } @@ -119,10 +120,9 @@ int HttpAuthHandlerMock::GenerateAuthTokenImpl( EXPECT_TRUE(auth_token_ == NULL); callback_ = callback; auth_token_ = auth_token; - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&HttpAuthHandlerMock::OnGenerateAuthToken, - weak_factory_.GetWeakPtr())); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(&HttpAuthHandlerMock::OnGenerateAuthToken, + weak_factory_.GetWeakPtr())); return ERR_IO_PENDING; } else { if (generate_rv_ == OK) |