DO NOT LAND

net/http/http_auth_handler_factory_unittest.cc

Index: net/http/http_auth_handler_factory_unittest.cc
diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc
index 2aa7958800c18eaf32cdf3e7f2060909577445aa..9502ddd2610b545b9e8211b56c842d59ff9ebacf 100644
--- a/net/http/http_auth_handler_factory_unittest.cc
+++ b/net/http/http_auth_handler_factory_unittest.cc
@@ -10,6 +10,7 @@
 #include "net/http/mock_allow_url_security_manager.h"
 #include "net/http/url_security_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/origin.h"
 
 namespace net {
 
@@ -23,7 +24,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory {
 
   int CreateAuthHandler(HttpAuthChallengeTokenizer* challenge,
                         HttpAuth::Target target,
-                        const GURL& origin,
+                        const url::Origin& origin,
                         CreateReason reason,
                         int nonce_count,
                         const BoundNetLog& net_log,
@@ -40,7 +41,7 @@ class MockHttpAuthHandlerFactory : public HttpAuthHandlerFactory {
 
 TEST(HttpAuthHandlerFactoryTest, RegistryFactory) {
   HttpAuthHandlerRegistryFactory registry_factory;
-  GURL gurl("www.google.com");
+  url::Origin origin("http://www.example.com");
   const int kBasicReturnCode = ERR_INVALID_SPDY_STREAM;
   MockHttpAuthHandlerFactory* mock_factory_basic =
       new MockHttpAuthHandlerFactory(kBasicReturnCode);
@@ -56,44 +57,44 @@ TEST(HttpAuthHandlerFactoryTest, RegistryFactory) {
   scoped_ptr<HttpAuthHandler> handler;
 
   // No schemes should be supported in the beginning.
-  EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
-            registry_factory.CreateAuthHandlerFromString(
-                "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+  EXPECT_EQ(
+      ERR_UNSUPPORTED_AUTH_SCHEME,
+      registry_factory.CreateAuthHandlerFromString(
+          "Basic", HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &handler));
 
   // Test what happens with a single scheme.
   registry_factory.RegisterSchemeFactory("Basic", mock_factory_basic);
-  EXPECT_EQ(kBasicReturnCode,
-            registry_factory.CreateAuthHandlerFromString(
-                "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
-  EXPECT_EQ(ERR_UNSUPPORTED_AUTH_SCHEME,
-            registry_factory.CreateAuthHandlerFromString(
-                "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
-                &handler));
+  EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+                                  "Basic", HttpAuth::AUTH_SERVER, origin,
+                                  BoundNetLog(), &handler));
+  EXPECT_EQ(
+      ERR_UNSUPPORTED_AUTH_SCHEME,
+      registry_factory.CreateAuthHandlerFromString(
+          "Digest", HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &handler));
 
   // Test multiple schemes
   registry_factory.RegisterSchemeFactory("Digest", mock_factory_digest);
-  EXPECT_EQ(kBasicReturnCode,
-            registry_factory.CreateAuthHandlerFromString(
-                "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
-  EXPECT_EQ(kDigestReturnCode,
-            registry_factory.CreateAuthHandlerFromString(
-                "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
-                &handler));
+  EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+                                  "Basic", HttpAuth::AUTH_SERVER, origin,
+                                  BoundNetLog(), &handler));
+  EXPECT_EQ(kDigestReturnCode, registry_factory.CreateAuthHandlerFromString(
+                                   "Digest", HttpAuth::AUTH_SERVER, origin,
+                                   BoundNetLog(), &handler));
 
   // Test case-insensitivity
-  EXPECT_EQ(kBasicReturnCode,
-            registry_factory.CreateAuthHandlerFromString(
-                "basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
+  EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+                                  "basic", HttpAuth::AUTH_SERVER, origin,
+                                  BoundNetLog(), &handler));
 
   // Test replacement of existing auth scheme
   registry_factory.RegisterSchemeFactory("Digest", mock_factory_digest_replace);
-  EXPECT_EQ(kBasicReturnCode,
-            registry_factory.CreateAuthHandlerFromString(
-                "Basic", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(), &handler));
-  EXPECT_EQ(kDigestReturnCodeReplace,
-            registry_factory.CreateAuthHandlerFromString(
-                "Digest", HttpAuth::AUTH_SERVER, gurl, BoundNetLog(),
-                &handler));
+  EXPECT_EQ(kBasicReturnCode, registry_factory.CreateAuthHandlerFromString(
+                                  "Basic", HttpAuth::AUTH_SERVER, origin,
+                                  BoundNetLog(), &handler));
+  EXPECT_EQ(
+      kDigestReturnCodeReplace,
+      registry_factory.CreateAuthHandlerFromString(
+          "Digest", HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &handler));
 }
 
 TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
@@ -103,8 +104,8 @@ TEST(HttpAuthHandlerFactoryTest, DefaultFactory) {
       HttpAuthHandlerFactory::CreateDefault(host_resolver.get()));
   http_auth_handler_factory->SetURLSecurityManager(
       "negotiate", &url_security_manager);
-  GURL server_origin("http://www.example.com");
-  GURL proxy_origin("http://cache.example.com:3128");
+  url::Origin server_origin("http://www.example.com");
+  url::Origin proxy_origin("http://cache.example.com:3128");
   {
     scoped_ptr<HttpAuthHandler> handler;
     int rv = http_auth_handler_factory->CreateAuthHandlerFromString(