[net/http auth] Split HttpAuthHandler creation from initialization.

net/http/http_network_transaction_unittest.cc

 // Copyright 2013 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_network_transaction.h"
 
 #include <math.h>  // ceil
 #include <stdarg.h>
 #include <stdint.h>
 
@@ skipping 10494 matching lines @@
     const TestConfig& test_config = test_configs[i];
 
     // Set up authentication handlers as necessary.
     if (test_config.proxy_auth_timing != AUTH_NONE) {
       for (int n = 0; n < 2; n++) {
         scoped_ptr<HttpAuthHandlerMock> auth_handler(new HttpAuthHandlerMock());
         auth_handler->SetGenerateExpectation(
             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) {
       scoped_ptr<HttpAuthHandlerMock> auth_handler(new HttpAuthHandlerMock());
       auth_handler->SetGenerateExpectation(
           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 =
           ProxyService::CreateFixed(test_config.proxy_url);
     } else {
       session_deps_.proxy_service = ProxyService::CreateDirect();
     }
 
     HttpRequestInfo request;
     request.method = "GET";
@@ skipping 81 matching lines @@
       new HttpAuthHandlerMock::Factory());
   session_deps_.http_auth_handler_factory.reset(auth_factory);
   session_deps_.proxy_service = ProxyService::CreateDirect();
   session_deps_.host_resolver->rules()->AddRule("www.example.com", "10.0.0.1");
   session_deps_.host_resolver->set_synchronous_mode(true);
 
   scoped_ptr<HttpAuthHandlerMock> auth_handler(new HttpAuthHandlerMock());
   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;
   const HttpResponseInfo* response = NULL;
   HttpRequestInfo request;
   request.method = "GET";
   request.url = origin;
   request.load_flags = 0;
 
   scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps_));
@@ skipping 286 matching lines @@
       ProxyService::CreateFixedFromPacResult("PROXY myproxy:70");
   TestNetLog net_log;
   session_deps_.net_log = &net_log;
   GURL request_url;
   {
     HttpAuthHandlerMock::Factory* auth_factory =
         new HttpAuthHandlerMock::Factory();
     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);
   }
 
   HttpRequestInfo request;
   request.method = "GET";
   request.url = GURL("http://www.example.org");
   request.load_flags = 0;
 
   // First round goes unauthenticated through the proxy.
   MockWrite data_writes_1[] = {
@@ skipping 3812 matching lines @@
   std::string response_data;
   EXPECT_EQ(OK, ReadTransaction(trans.get(), &response_data));
 
   EXPECT_EQ(CountWriteBytes(data_writes, arraysize(data_writes)),
             trans->GetTotalSentBytes());
   EXPECT_EQ(CountReadBytes(data_reads, arraysize(data_reads)),
             trans->GetTotalReceivedBytes());
 }
 
 }  // namespace net