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

net/http/http_auth_handler_mock.h

 // Copyright (c) 2011 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.
 
 #ifndef NET_HTTP_HTTP_AUTH_HANDLER_MOCK_H_
 #define NET_HTTP_HTTP_AUTH_HANDLER_MOCK_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "net/http/http_auth.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "url/gurl.h"
 
 namespace net {
 
 class HostResolver;
 
+enum class HttpAuthHandlerCreateReason { PREEMPTIVE, CHALLENGE };
+
 // MockAuthHandler is used in tests to reliably trigger edge cases.
 class HttpAuthHandlerMock : public HttpAuthHandler {
  public:
   // The Factory class returns handlers in the order they were added via
   // AddMockHandler.
   class Factory : public HttpAuthHandlerFactory {
    public:
     Factory();
     ~Factory() override;
 
     void AddMockHandler(scoped_ptr<HttpAuthHandler> handler,
-                        CreateReason reason,
-                        HttpAuth::Target target);
+                        HttpAuthHandlerCreateReason reason);
 
-    bool HaveAuthHandlers(HttpAuth::Target) const;
+    bool HaveAuthHandlers() const;
 
     // HttpAuthHandlerFactory:
-    int CreateAuthHandler(const HttpAuthChallengeTokenizer& challenge,
-                          HttpAuth::Target target,
-                          const GURL& origin,
-                          CreateReason reason,
-                          int nonce_count,
-                          const BoundNetLog& net_log,
-                          scoped_ptr<HttpAuthHandler>* handler) override;
+    scoped_ptr<HttpAuthHandler> CreateAuthHandlerForScheme(
+        const std::string& scheme) override;
+    scoped_ptr<HttpAuthHandler> CreateAndInitPreemptiveAuthHandler(
+        HttpAuthCache::Entry* cache_entry,
+        const HttpAuthChallengeTokenizer& tokenizer,
+        HttpAuth::Target target,
+        const BoundNetLog& net_log) override;
 
    private:
-    ScopedVector<HttpAuthHandler>
-        challenge_handlers_[HttpAuth::AUTH_NUM_TARGETS];
-    ScopedVector<HttpAuthHandler>
-        preemptive_handlers_[HttpAuth::AUTH_NUM_TARGETS];
+    scoped_ptr<HttpAuthHandler> GetNextAuthHandler(
+        ScopedVector<HttpAuthHandler>* handler_list);
+    ScopedVector<HttpAuthHandler> challenge_handlers_;
+    ScopedVector<HttpAuthHandler> preemptive_handlers_;
   };
 
   HttpAuthHandlerMock();
 
   ~HttpAuthHandlerMock() override;
 
   void SetGenerateExpectation(bool async, int rv);
 
   void set_expected_auth_scheme(const std::string& scheme) {
-    expected_auth_scheme_ = scheme;
+    auth_scheme_ = scheme;
+  }
+
+  void set_expected_auth_target(HttpAuth::Target target) {
+    expected_auth_target_ = target;
   }
 
   void set_expect_multiple_challenges(bool expect_multiple_challenges) {
     expect_multiple_challenges_ = expect_multiple_challenges;
   }
 
   void set_allows_default_credentials(bool allows_default_credentials) {
     allows_default_credentials_ = allows_default_credentials;
   }
 
@@ skipping 21 matching lines @@
 
   int GenerateAuthTokenImpl(const AuthCredentials* credentials,
                             const HttpRequestInfo& request,
                             const CompletionCallback& callback,
                             std::string* auth_token) override;
 
  private:
   void OnGenerateAuthToken();
 
   CompletionCallback callback_;
-  std::string expected_auth_scheme_;
   bool generate_async_ = false;
   int generate_rv_ = 0;
   std::string auth_token_;
   std::string* generate_auth_token_buffer_ = nullptr;
   bool first_round_ = true;
   bool allows_default_credentials_ = false;
   bool allows_explicit_credentials_ = true;
   bool expect_multiple_challenges_ = false;
+  HttpAuth::Target expected_auth_target_ = HttpAuth::AUTH_SERVER;
   GURL request_url_;
   base::WeakPtrFactory<HttpAuthHandlerMock> weak_factory_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_AUTH_HANDLER_MOCK_H_