DO NOT LAND

net/http/http_auth_cache.h

Index: net/http/http_auth_cache.h
diff --git a/net/http/http_auth_cache.h b/net/http/http_auth_cache.h
index f05f8184d023a50fb9ae736a4db8b2d110221097..25219ef60c945e8dcb46236f239a3e0c374bac98 100644
--- a/net/http/http_auth_cache.h
+++ b/net/http/http_auth_cache.h
@@ -13,7 +13,7 @@
 #include "base/time/time.h"
 #include "net/base/net_export.h"
 #include "net/http/http_auth.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 namespace net {
 
@@ -31,9 +31,7 @@ class NET_EXPORT_PRIVATE HttpAuthCache {
    public:
     ~Entry();
 
-    const GURL& origin() const {
-      return origin_;
-    }
+    const url::Origin& origin() const { return origin_; }
 
     // The case-sensitive realm string of the challenge.
     const std::string& realm() const { return realm_; }
@@ -81,7 +79,7 @@ class NET_EXPORT_PRIVATE HttpAuthCache {
     bool HasEnclosingPath(const std::string& dir, size_t* path_len);
 
     // |origin_| contains the {protocol, host, port} of the server.
-    GURL origin_;
+    url::Origin origin_;
     std::string realm_;
     HttpAuth::Scheme scheme_;
 
@@ -116,7 +114,7 @@ class NET_EXPORT_PRIVATE HttpAuthCache {
   //   |realm|  - case sensitive realm string.
   //   |scheme| - the authentication scheme (i.e. basic, negotiate).
   //   returns  - the matched entry or NULL.
-  Entry* Lookup(const GURL& origin,
+  Entry* Lookup(const url::Origin& origin,
                 const std::string& realm,
                 HttpAuth::Scheme scheme);
 
@@ -127,7 +125,7 @@ class NET_EXPORT_PRIVATE HttpAuthCache {
   //   |path|   - absolute path of the resource, or empty string in case of
   //              proxy auth (which does not use the concept of paths).
   //   returns  - the matched entry or NULL.
-  Entry* LookupByPath(const GURL& origin, const std::string& path);
+  Entry* LookupByPath(const url::Origin& origin, const std::string& path);
 
   // Add an entry on server |origin| for realm |handler->realm()| and
   // scheme |handler->scheme()|.  If an entry for this (realm,scheme)
@@ -140,7 +138,7 @@ class NET_EXPORT_PRIVATE HttpAuthCache {
   //   |path|     - absolute path for a resource contained in the protection
   //                space; this will be added to the list of known paths.
   //   returns    - the entry that was just added/updated.
-  Entry* Add(const GURL& origin,
+  Entry* Add(const url::Origin& origin,
              const std::string& realm,
              HttpAuth::Scheme scheme,
              const std::string& auth_challenge,
@@ -154,7 +152,7 @@ class NET_EXPORT_PRIVATE HttpAuthCache {
   //   |scheme|   - the authentication scheme (i.e. basic, negotiate).
   //   |credentials| - the credentials to match.
   //   returns    - true if an entry was removed.
-  bool Remove(const GURL& origin,
+  bool Remove(const url::Origin& origin,
               const std::string& realm,
               HttpAuth::Scheme scheme,
               const AuthCredentials& credentials);
@@ -167,7 +165,7 @@ class NET_EXPORT_PRIVATE HttpAuthCache {
   // |auth_challenge| and the nonce count is reset.
   // |UpdateStaleChallenge()| returns true if a matching entry exists in the
   // cache, false otherwise.
-  bool UpdateStaleChallenge(const GURL& origin,
+  bool UpdateStaleChallenge(const url::Origin& origin,
                             const std::string& realm,
                             HttpAuth::Scheme scheme,
                             const std::string& auth_challenge);