Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Unified Diff: net/url_request/url_request_ftp_job.cc

Issue 1151843002: DO NOT LAND Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More. Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/url_request/url_request_ftp_job.cc
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index 09c6f0f7548f7b5bd61842d0b60b2fb389f4ef0f..69418a0dd7848d8b17ced77abd6c7b0cf4937389 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -20,6 +20,7 @@
#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 {
@@ -323,8 +324,7 @@ void URLRequestFtpJob::SetAuth(const AuthCredentials& credentials) {
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();
@@ -379,7 +379,7 @@ bool URLRequestFtpJob::ReadRawData(IOBuffer* buf,
}
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) {

Powered by Google App Engine
This is Rietveld 408576698