DO NOT LAND

net/http/http_auth_controller.cc

Index: net/http/http_auth_controller.cc
diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc
index 8fc6c17684f204aa7fe922f3746a087e51e5bebd..4141971090381d33109b3f3726d99c8e6056de52 100644
--- a/net/http/http_auth_controller.cc
+++ b/net/http/http_auth_controller.cc
@@ -158,7 +158,7 @@ HttpAuthController::HttpAuthController(
     HttpAuthHandlerFactory* http_auth_handler_factory)
     : target_(target),
       auth_url_(auth_url),
-      auth_origin_(auth_url.GetOrigin()),
+      auth_origin_(url::Origin(auth_url)),
       auth_path_(HttpAuth::AUTH_PROXY ? std::string() : auth_url.path()),
       embedded_identity_used_(false),
       default_credentials_used_(false),
@@ -252,7 +252,7 @@ int HttpAuthController::HandleAuthChallenge(
     const BoundNetLog& net_log) {
   DCHECK(CalledOnValidThread());
   DCHECK(headers.get());
-  DCHECK(auth_origin_.is_valid());
+  DCHECK(!auth_origin_.unique());
   VLOG(1) << "The " << HttpAuth::GetAuthTargetString(target_) << " "
           << auth_origin_ << " requested auth "
           << AuthChallengeLogMessage(headers.get());
@@ -509,7 +509,7 @@ void HttpAuthController::PopulateAuthChallenge() {
 
   auth_info_ = new AuthChallengeInfo;
   auth_info_->is_proxy = (target_ == HttpAuth::AUTH_PROXY);
-  auth_info_->challenger = HostPortPair::FromURL(auth_origin_);
+  auth_info_->challenger = HostPortPair::FromOrigin(auth_origin_);
   auth_info_->scheme = HttpAuth::SchemeToString(handler_->auth_scheme());
   auth_info_->realm = handler_->realm();
 }