DO NOT LAND

net/url_request/url_request_ftp_job.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_ftp_job.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/auth.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/ftp/ftp_auth_cache.h"
 #include "net/ftp/ftp_response_info.h"
 #include "net/ftp/ftp_transaction_factory.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
+#include "url/origin.h"
 
 namespace net {
 
 URLRequestFtpJob::URLRequestFtpJob(
     URLRequest* request,
     NetworkDelegate* network_delegate,
     FtpTransactionFactory* ftp_transaction_factory,
     FtpAuthCache* ftp_auth_cache)
     : URLRequestJob(request, network_delegate),
       priority_(DEFAULT_PRIORITY),
@@ skipping 283 matching lines @@
 }
 
 void URLRequestFtpJob::SetAuth(const AuthCredentials& credentials) {
   DCHECK(ftp_transaction_ || http_transaction_);
   DCHECK(NeedsAuth());
 
   auth_data_->state = AUTH_STATE_HAVE_AUTH;
   auth_data_->credentials = credentials;
 
   if (ftp_transaction_) {
-    ftp_auth_cache_->Add(request_->url().GetOrigin(),
-                         auth_data_->credentials);
+    ftp_auth_cache_->Add(url::Origin(request_->url()), auth_data_->credentials);
   }
 
   RestartTransactionWithAuth();
 }
 
 void URLRequestFtpJob::CancelAuth() {
   DCHECK(ftp_transaction_ || http_transaction_);
   DCHECK(NeedsAuth());
 
   auth_data_->state = AUTH_STATE_CANCELED;
@@ skipping 34 matching lines @@
   if (rv == ERR_IO_PENDING) {
     read_in_progress_ = true;
     SetStatus(URLRequestStatus(URLRequestStatus::IO_PENDING, 0));
   } else {
     NotifyDone(URLRequestStatus(URLRequestStatus::FAILED, rv));
   }
   return false;
 }
 
 void URLRequestFtpJob::HandleAuthNeededResponse() {
-  GURL origin = request_->url().GetOrigin();
+  url::Origin origin = url::Origin(request_->url());
 
   if (auth_data_.get()) {
     if (auth_data_->state == AUTH_STATE_CANCELED) {
       NotifyHeadersComplete();
       return;
     }
 
     if (ftp_transaction_ && auth_data_->state == AUTH_STATE_HAVE_AUTH)
       ftp_auth_cache_->Remove(origin, auth_data_->credentials);
   } else {
     auth_data_ = new AuthData;
   }
   auth_data_->state = AUTH_STATE_NEED_AUTH;
 
   FtpAuthCache::Entry* cached_auth = NULL;
   if (ftp_transaction_ && ftp_transaction_->GetResponseInfo()->needs_auth)
     cached_auth = ftp_auth_cache_->Lookup(origin);
   if (cached_auth) {
     // Retry using cached auth data.
     SetAuth(cached_auth->credentials);
   } else {
     // Prompt for a username/password.
     NotifyHeadersComplete();
   }
 }
 
 }  // namespace net