| Index: net/http/http_network_transaction_unittest.cc
|
| diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
|
| index d4c963669d77745fe0b4ab9e7836318ee15f0dcb..7e50808d9dc0f064ddb3c69fe1646a5d1c2f72de 100644
|
| --- a/net/http/http_network_transaction_unittest.cc
|
| +++ b/net/http/http_network_transaction_unittest.cc
|
| @@ -10512,10 +10512,9 @@ TEST_P(HttpNetworkTransactionTest, GenerateAuthToken) {
|
| test_config.proxy_auth_timing == AUTH_ASYNC,
|
| test_config.proxy_auth_rv);
|
| auth_factory->AddMockHandler(
|
| - auth_handler.Pass(),
|
| - n == 0 ? HttpAuthHandlerFactory::CREATE_CHALLENGE
|
| - : HttpAuthHandlerFactory::CREATE_PREEMPTIVE,
|
| - HttpAuth::AUTH_PROXY);
|
| + auth_handler.Pass(), n == 0
|
| + ? HttpAuthHandlerCreateReason::CHALLENGE
|
| + : HttpAuthHandlerCreateReason::PREEMPTIVE);
|
| }
|
| }
|
| if (test_config.server_auth_timing != AUTH_NONE) {
|
| @@ -10524,8 +10523,7 @@ TEST_P(HttpNetworkTransactionTest, GenerateAuthToken) {
|
| test_config.server_auth_timing == AUTH_ASYNC,
|
| test_config.server_auth_rv);
|
| auth_factory->AddMockHandler(auth_handler.Pass(),
|
| - HttpAuthHandlerFactory::CREATE_CHALLENGE,
|
| - HttpAuth::AUTH_SERVER);
|
| + HttpAuthHandlerCreateReason::CHALLENGE);
|
| }
|
| if (test_config.proxy_url) {
|
| session_deps_.proxy_service =
|
| @@ -10627,8 +10625,7 @@ TEST_P(HttpNetworkTransactionTest, MultiRoundAuth) {
|
| auth_handler->SetGenerateExpectation(false, OK);
|
| auth_handler->set_expect_multiple_challenges(true);
|
| auth_factory->AddMockHandler(auth_handler.Pass(),
|
| - HttpAuthHandlerFactory::CREATE_CHALLENGE,
|
| - HttpAuth::AUTH_SERVER);
|
| + HttpAuthHandlerCreateReason::CHALLENGE);
|
|
|
| GURL origin("http://www.example.com");
|
| int rv = OK;
|
| @@ -10935,8 +10932,7 @@ TEST_P(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) {
|
| scoped_ptr<UrlRecordingHttpAuthHandlerMock> auth_handler(
|
| new UrlRecordingHttpAuthHandlerMock(&request_url));
|
| auth_factory->AddMockHandler(auth_handler.Pass(),
|
| - HttpAuthHandlerFactory::CREATE_CHALLENGE,
|
| - HttpAuth::AUTH_PROXY);
|
| + HttpAuthHandlerCreateReason::CHALLENGE);
|
| session_deps_.http_auth_handler_factory.reset(auth_factory);
|
| }
|
|
|
|
|