From 39d357e3248f80abea0159765ff39554affb40db Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 4 Jan 2017 14:17:57 +0100 Subject: BASELINE: Update Chromium to 55.0.2883.105 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael Brüning --- chromium/net/http/http_auth_handler_unittest.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'chromium/net/http/http_auth_handler_unittest.cc') diff --git a/chromium/net/http/http_auth_handler_unittest.cc b/chromium/net/http/http_auth_handler_unittest.cc index 1bb384ff1cd..b684cb2dba8 100644 --- a/chromium/net/http/http_auth_handler_unittest.cc +++ b/chromium/net/http/http_auth_handler_unittest.cc @@ -11,6 +11,8 @@ #include "net/http/http_auth_challenge_tokenizer.h" #include "net/http/http_auth_handler_mock.h" #include "net/http/http_request_info.h" +#include "net/log/net_log_event_type.h" +#include "net/log/net_log_source_type.h" #include "net/log/test_net_log.h" #include "net/log/test_net_log_entry.h" #include "net/log/test_net_log_util.h" @@ -35,18 +37,18 @@ TEST(HttpAuthHandlerTest, NetLog) { TestCompletionCallback test_callback; HttpAuth::Target target = (k == 0) ? HttpAuth::AUTH_PROXY : HttpAuth::AUTH_SERVER; - NetLog::EventType event_type = - (k == 0) ? NetLog::TYPE_AUTH_PROXY : NetLog::TYPE_AUTH_SERVER; + NetLogEventType event_type = (k == 0) ? NetLogEventType::AUTH_PROXY + : NetLogEventType::AUTH_SERVER; HttpAuthChallengeTokenizer tokenizer( challenge.begin(), challenge.end()); HttpAuthHandlerMock mock_handler; TestNetLog test_net_log; - BoundNetLog bound_net_log( - BoundNetLog::Make(&test_net_log, NetLog::SOURCE_NONE)); + NetLogWithSource net_log( + NetLogWithSource::Make(&test_net_log, NetLogSourceType::NONE)); SSLInfo empty_ssl_info; mock_handler.InitFromChallenge(&tokenizer, target, empty_ssl_info, - origin, bound_net_log); + origin, net_log); mock_handler.SetGenerateExpectation(async, rv); mock_handler.GenerateAuthToken(&credentials, &request, test_callback.callback(), &auth_token); -- cgit v1.2.1