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

net/url_request/url_request_context_builder_unittest.cc

 // Copyright (c) 2012 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/url_request/url_request_context_builder.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
 #include "net/base/request_priority.h"
 #include "net/http/http_auth_handler.h"
 #include "net/http/http_auth_handler_factory.h"
+#include "net/http/http_auth_handler_mock.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_fixed.h"
 #endif  // defined(OS_LINUX) || defined(OS_ANDROID)
 
 namespace net {
 
 namespace {
 
-class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory {
- public:
-  explicit MockHttpAuthHandlerFactory(int return_code) :
-      return_code_(return_code) {}
-  ~MockHttpAuthHandlerFactory() override {}
-
-  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 {
-    handler->reset();
-    return return_code_;
-  }
-
- private:
-  int return_code_;
-};
-
 class URLRequestContextBuilderTest : public PlatformTest {
  protected:
   URLRequestContextBuilderTest()
       : test_server_(SpawnedTestServer::TYPE_HTTP,
                      SpawnedTestServer::kLocalhost,
                      base::FilePath(
                          FILE_PATH_LITERAL("net/data/url_request_unittest"))) {
 #if defined(OS_LINUX) || defined(OS_ANDROID)
     builder_.set_proxy_config_service(make_scoped_ptr(
         new ProxyConfigServiceFixed(ProxyConfig::CreateDirect())));
@@ skipping 27 matching lines @@
   scoped_ptr<URLRequest> request(
       context->CreateRequest(test_server_.GetURL("echoheader?User-Agent"),
                              DEFAULT_PRIORITY, &delegate));
   request->set_method("GET");
   request->Start();
   base::MessageLoop::current()->Run();
   EXPECT_EQ("Bar", delegate.data_received());
 }
 
 TEST_F(URLRequestContextBuilderTest, ExtraHttpAuthHandlerFactory) {
+  const char kExtraScheme[] = "extrascheme";
   GURL gurl("www.google.com");
-  const int kBasicReturnCode = OK;
-  MockHttpAuthHandlerFactory* mock_factory_basic =
-      new MockHttpAuthHandlerFactory(kBasicReturnCode);
+  scoped_ptr<HttpAuthHandlerMock::Factory> mock_auth_factory(
+      new HttpAuthHandlerMock::Factory());
+  scoped_ptr<HttpAuthHandlerMock> mock_handler(new HttpAuthHandlerMock());
+  mock_handler->set_expected_auth_scheme(kExtraScheme);
+  mock_auth_factory->AddMockHandler(mock_handler.Pass(),
+                                    HttpAuthHandlerCreateReason::CHALLENGE);
+
   scoped_ptr<HttpAuthHandler> handler;
-  builder_.add_http_auth_handler_factory("extrascheme", mock_factory_basic);
+  builder_.add_http_auth_handler_factory(kExtraScheme,
+                                         mock_auth_factory.release());
   scoped_ptr<URLRequestContext> context(builder_.Build());
-  // Verify that a handler is returned for and added scheme.
-  EXPECT_EQ(kBasicReturnCode,
-            context->http_auth_handler_factory()->CreateAuthHandlerFromString(
-                "ExtraScheme",
-                HttpAuth::AUTH_SERVER,
-                gurl,
-                BoundNetLog(),
-                &handler));
-  // Verify that a handler isn't returned for a bogus scheme.
-  EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
-            context->http_auth_handler_factory()->CreateAuthHandlerFromString(
-                "Bogus", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+  // Verify that a handler is returned for a known scheme.
+  scoped_ptr<HttpAuthHandler> auth_handler =
+      context->http_auth_handler_factory()->CreateAuthHandlerForScheme(
+          kExtraScheme);
+  EXPECT_TRUE(auth_handler);
+
+  // Verify that a handler is not returned for an unknown scheme.
+  auth_handler =
+      context->http_auth_handler_factory()->CreateAuthHandlerForScheme("bogus");
+  EXPECT_FALSE(auth_handler);
 }
 
 }  // namespace
 
 }  // namespace net