Commit 4cdf16d3 authored by asanka's avatar asanka Committed by Commit bot

[net] Remove AuthData from net/base/auth.h.

This is only used in URLRequestFtpJob.

R=mmenke@chromium.org
BUG=529319

Review-Url: https://codereview.chromium.org/2398153002
Cr-Commit-Position: refs/heads/master@{#423706}
parent 5a8a725d
...@@ -19,12 +19,6 @@ bool AuthChallengeInfo::Equals(const AuthChallengeInfo& that) const { ...@@ -19,12 +19,6 @@ bool AuthChallengeInfo::Equals(const AuthChallengeInfo& that) const {
AuthChallengeInfo::~AuthChallengeInfo() { AuthChallengeInfo::~AuthChallengeInfo() {
} }
AuthData::AuthData() : state(AUTH_STATE_NEED_AUTH) {
}
AuthData::~AuthData() {
}
AuthCredentials::AuthCredentials() { AuthCredentials::AuthCredentials() {
} }
......
...@@ -89,19 +89,6 @@ enum AuthState { ...@@ -89,19 +89,6 @@ enum AuthState {
AUTH_STATE_CANCELED AUTH_STATE_CANCELED
}; };
class AuthData : public base::RefCountedThreadSafe<AuthData> {
public:
AuthState state; // whether we need, have, or gave up on authentication.
AuthCredentials credentials; // The credentials to use for auth.
// We wouldn't instantiate this class if we didn't need authentication.
AuthData();
private:
friend class base::RefCountedThreadSafe<AuthData>;
~AuthData();
};
} // namespace net } // namespace net
#endif // NET_BASE_AUTH_H__ #endif // NET_BASE_AUTH_H__
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/location.h" #include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h" #include "base/threading/thread_task_runner_handle.h"
...@@ -24,6 +25,19 @@ ...@@ -24,6 +25,19 @@
namespace net { namespace net {
class URLRequestFtpJob::AuthData {
public:
AuthState state; // Whether we need, have, or gave up on authentication.
AuthCredentials credentials; // The credentials to use for auth.
AuthData();
~AuthData();
};
URLRequestFtpJob::AuthData::AuthData() : state(AUTH_STATE_NEED_AUTH) {}
URLRequestFtpJob::AuthData::~AuthData() {}
URLRequestFtpJob::URLRequestFtpJob( URLRequestFtpJob::URLRequestFtpJob(
URLRequest* request, URLRequest* request,
NetworkDelegate* network_delegate, NetworkDelegate* network_delegate,
...@@ -358,7 +372,7 @@ void URLRequestFtpJob::HandleAuthNeededResponse() { ...@@ -358,7 +372,7 @@ void URLRequestFtpJob::HandleAuthNeededResponse() {
if (ftp_transaction_ && auth_data_->state == AUTH_STATE_HAVE_AUTH) if (ftp_transaction_ && auth_data_->state == AUTH_STATE_HAVE_AUTH)
ftp_auth_cache_->Remove(origin, auth_data_->credentials); ftp_auth_cache_->Remove(origin, auth_data_->credentials);
} else { } else {
auth_data_ = new AuthData; auth_data_ = base::MakeUnique<AuthData>();
} }
auth_data_->state = AUTH_STATE_NEED_AUTH; auth_data_->state = AUTH_STATE_NEED_AUTH;
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#ifndef NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_ #ifndef NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_
#define NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_ #define NET_URL_REQUEST_URL_REQUEST_FTP_JOB_H_
#include <memory>
#include <string> #include <string>
#include "base/macros.h" #include "base/macros.h"
...@@ -49,6 +50,8 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob { ...@@ -49,6 +50,8 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
RequestPriority priority() const { return priority_; } RequestPriority priority() const { return priority_; }
private: private:
class AuthData;
void OnResolveProxyComplete(int result); void OnResolveProxyComplete(int result);
void StartFtpTransaction(); void StartFtpTransaction();
...@@ -89,7 +92,7 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob { ...@@ -89,7 +92,7 @@ class NET_EXPORT_PRIVATE URLRequestFtpJob : public URLRequestJob {
bool read_in_progress_; bool read_in_progress_;
scoped_refptr<AuthData> auth_data_; std::unique_ptr<AuthData> auth_data_;
FtpTransactionFactory* ftp_transaction_factory_; FtpTransactionFactory* ftp_transaction_factory_;
FtpAuthCache* ftp_auth_cache_; FtpAuthCache* ftp_auth_cache_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment