diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 17:22:45 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-12 17:22:45 +0000 |
commit | afc26521e0f0b4960337eb3473c1529a6fb407af (patch) | |
tree | c5f8760aceae670a6d0a1fd4b2f40ca8f02547d5 /net/http | |
parent | 66c51f716433a3bf9fb0a5547919df61f040f7cd (diff) | |
download | chromium_src-afc26521e0f0b4960337eb3473c1529a6fb407af.zip chromium_src-afc26521e0f0b4960337eb3473c1529a6fb407af.tar.gz chromium_src-afc26521e0f0b4960337eb3473c1529a6fb407af.tar.bz2 |
Rename SSLNonSensitiveHostInfo to SSLHostInfo.
No effective code change.
BUG=none
TEST=net_unittests
Review URL: http://codereview.chromium.org/3728002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62295 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r-- | net/http/disk_cache_based_ssl_host_info.h | 6 | ||||
-rw-r--r-- | net/http/http_cache_transaction.cc | 2 | ||||
-rw-r--r-- | net/http/http_network_transaction.cc | 5 | ||||
-rw-r--r-- | net/http/http_network_transaction.h | 4 | ||||
-rw-r--r-- | net/http/http_transaction.h | 8 |
5 files changed, 12 insertions, 13 deletions
diff --git a/net/http/disk_cache_based_ssl_host_info.h b/net/http/disk_cache_based_ssl_host_info.h index 7b1e972..5cab8ff 100644 --- a/net/http/disk_cache_based_ssl_host_info.h +++ b/net/http/disk_cache_based_ssl_host_info.h @@ -11,7 +11,7 @@ #include "base/non_thread_safe.h" #include "base/scoped_ptr.h" #include "net/base/completion_callback.h" -#include "net/base/ssl_non_sensitive_host_info.h" +#include "net/base/ssl_host_info.h" #include "net/disk_cache/disk_cache.h" namespace net { @@ -22,12 +22,12 @@ class HttpCache; // DiskCacheBasedSSLHostInfo fetches information about an SSL host from our // standard disk cache. Since the information is defined to be non-sensitive, // it's ok for us to keep it on disk. -class DiskCacheBasedSSLHostInfo : public SSLNonSensitiveHostInfo, +class DiskCacheBasedSSLHostInfo : public SSLHostInfo, public NonThreadSafe { public: DiskCacheBasedSSLHostInfo(const std::string& hostname, HttpCache* http_cache); - // Implementation of SSLNonSensitiveHostInfo + // Implementation of SSLHostInfo virtual void Start(); virtual int WaitForDataReady(CompletionCallback* callback); virtual const std::string& data() const { return data_; } diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index a6ef5e0..ce7315b 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc @@ -633,7 +633,7 @@ int HttpCache::Transaction::DoSendRequest() { // ssl_config_service.h scoped_refptr<DiskCacheBasedSSLHostInfo> hostinfo = new DiskCacheBasedSSLHostInfo(request_->url.host(), cache_); - network_trans_->SetSSLNonSensitiveHostInfo(hostinfo.get()); + network_trans_->SetSSLHostInfo(hostinfo.get()); } rv = network_trans_->Start(request_, &io_callback_, net_log_); return rv; diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index c773b10..8ef9aca 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc @@ -26,7 +26,7 @@ #include "net/base/net_util.h" #include "net/base/ssl_cert_request_info.h" #include "net/base/ssl_connection_status_flags.h" -#include "net/base/ssl_non_sensitive_host_info.h" +#include "net/base/ssl_host_info.h" #include "net/base/upload_data_stream.h" #include "net/http/http_auth.h" #include "net/http/http_auth_handler.h" @@ -416,8 +416,7 @@ uint64 HttpNetworkTransaction::GetUploadProgress() const { return stream_->GetUploadProgress(); } -void HttpNetworkTransaction::SetSSLNonSensitiveHostInfo( - SSLNonSensitiveHostInfo* host_info) { +void HttpNetworkTransaction::SetSSLHostInfo(SSLHostInfo* host_info) { ssl_config_.ssl_host_info = host_info; } diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h index 37fb5aa..b53363e 100644 --- a/net/http/http_network_transaction.h +++ b/net/http/http_network_transaction.h @@ -30,7 +30,7 @@ class HttpNetworkSession; class HttpStream; class HttpStreamRequest; class IOBuffer; -class SSLNonSensitiveHostInfo; +class SSLHostInfo; struct HttpRequestInfo; class HttpNetworkTransaction : public HttpTransaction, @@ -57,7 +57,7 @@ class HttpNetworkTransaction : public HttpTransaction, virtual const HttpResponseInfo* GetResponseInfo() const; virtual LoadState GetLoadState() const; virtual uint64 GetUploadProgress() const; - virtual void SetSSLNonSensitiveHostInfo(SSLNonSensitiveHostInfo* host_info); + virtual void SetSSLHostInfo(SSLHostInfo* host_info); // StreamRequestDelegate methods: virtual void OnStreamReady(HttpStream* stream); diff --git a/net/http/http_transaction.h b/net/http/http_transaction.h index 2fcd245..1923851 100644 --- a/net/http/http_transaction.h +++ b/net/http/http_transaction.h @@ -17,7 +17,7 @@ struct HttpRequestInfo; class HttpResponseInfo; class IOBuffer; class X509Certificate; -class SSLNonSensitiveHostInfo; +class SSLHostInfo; // Represents a single HTTP transaction (i.e., a single request/response pair). // HTTP redirects are not followed and authentication challenges are not @@ -106,10 +106,10 @@ class HttpTransaction { // zero will be returned. This does not include the request headers. virtual uint64 GetUploadProgress() const = 0; - // SetSSLNonSensitiveHostInfo sets a object which reads and writes public - // information about an SSL server. It's used to implement Snap Start. + // SetSSLHostInfo sets a object which reads and writes public information + // about an SSL server. It's used to implement Snap Start. // TODO(agl): remove this. - virtual void SetSSLNonSensitiveHostInfo(SSLNonSensitiveHostInfo*) { }; + virtual void SetSSLHostInfo(SSLHostInfo*) { }; }; } // namespace net |