summaryrefslogtreecommitdiffstats
path: root/net/ssl
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-21 05:00:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-21 12:00:44 +0000
commitb03027d238812b84860eaa4608df71442748c44d (patch)
tree1e1406538a891030ddaeb3daf61640e59d02a052 /net/ssl
parente59c1bb95b7f2f381d6a0c38c6f6f1c9a89c4ed4 (diff)
downloadchromium_src-b03027d238812b84860eaa4608df71442748c44d.zip
chromium_src-b03027d238812b84860eaa4608df71442748c44d.tar.gz
chromium_src-b03027d238812b84860eaa4608df71442748c44d.tar.bz2
Standardize usage of virtual/override/final in net/
This patch was automatically generated by applying clang fixit hints generated by the plugin to the source tree. BUG=417463 TBR=rsleevi@chromium.org Review URL: https://codereview.chromium.org/667923003 Cr-Commit-Position: refs/heads/master@{#300466}
Diffstat (limited to 'net/ssl')
-rw-r--r--net/ssl/channel_id_service_unittest.cc34
-rw-r--r--net/ssl/client_cert_store_mac.h8
-rw-r--r--net/ssl/default_channel_id_store.cc20
-rw-r--r--net/ssl/default_channel_id_store.h45
-rw-r--r--net/ssl/default_channel_id_store_unittest.cc10
-rw-r--r--net/ssl/ssl_client_auth_cache.h4
-rw-r--r--net/ssl/ssl_config_service_defaults.h4
-rw-r--r--net/ssl/ssl_config_service_unittest.cc6
8 files changed, 62 insertions, 69 deletions
diff --git a/net/ssl/channel_id_service_unittest.cc b/net/ssl/channel_id_service_unittest.cc
index 52083e8..b5fc006 100644
--- a/net/ssl/channel_id_service_unittest.cc
+++ b/net/ssl/channel_id_service_unittest.cc
@@ -35,16 +35,16 @@ class FailingTaskRunner : public base::TaskRunner {
public:
FailingTaskRunner() {}
- virtual bool PostDelayedTask(const tracked_objects::Location& from_here,
- const base::Closure& task,
- base::TimeDelta delay) override {
+ bool PostDelayedTask(const tracked_objects::Location& from_here,
+ const base::Closure& task,
+ base::TimeDelta delay) override {
return false;
}
- virtual bool RunsTasksOnCurrentThread() const override { return true; }
+ bool RunsTasksOnCurrentThread() const override { return true; }
protected:
- virtual ~FailingTaskRunner() {}
+ ~FailingTaskRunner() override {}
private:
DISALLOW_COPY_AND_ASSIGN(FailingTaskRunner);
@@ -56,21 +56,21 @@ class MockChannelIDStoreWithAsyncGet
MockChannelIDStoreWithAsyncGet()
: DefaultChannelIDStore(NULL), channel_id_count_(0) {}
- virtual int GetChannelID(const std::string& server_identifier,
- base::Time* expiration_time,
- std::string* private_key_result,
- std::string* cert_result,
- const GetChannelIDCallback& callback) override;
-
- virtual void SetChannelID(const std::string& server_identifier,
- base::Time creation_time,
- base::Time expiration_time,
- const std::string& private_key,
- const std::string& cert) override {
+ int GetChannelID(const std::string& server_identifier,
+ base::Time* expiration_time,
+ std::string* private_key_result,
+ std::string* cert_result,
+ const GetChannelIDCallback& callback) override;
+
+ void SetChannelID(const std::string& server_identifier,
+ base::Time creation_time,
+ base::Time expiration_time,
+ const std::string& private_key,
+ const std::string& cert) override {
channel_id_count_ = 1;
}
- virtual int GetChannelIDCount() override { return channel_id_count_; }
+ int GetChannelIDCount() override { return channel_id_count_; }
void CallGetChannelIDCallbackWithResult(int err,
base::Time expiration_time,
diff --git a/net/ssl/client_cert_store_mac.h b/net/ssl/client_cert_store_mac.h
index 5c697db..23e3a2f 100644
--- a/net/ssl/client_cert_store_mac.h
+++ b/net/ssl/client_cert_store_mac.h
@@ -17,12 +17,12 @@ namespace net {
class NET_EXPORT ClientCertStoreMac : public ClientCertStore {
public:
ClientCertStoreMac();
- virtual ~ClientCertStoreMac();
+ ~ClientCertStoreMac() override;
// ClientCertStore:
- virtual void GetClientCerts(const SSLCertRequestInfo& cert_request_info,
- CertificateList* selected_certs,
- const base::Closure& callback) override;
+ void GetClientCerts(const SSLCertRequestInfo& cert_request_info,
+ CertificateList* selected_certs,
+ const base::Closure& callback) override;
private:
friend class ClientCertStoreMacTest;
diff --git a/net/ssl/default_channel_id_store.cc b/net/ssl/default_channel_id_store.cc
index 4f43fbc..b71d7b3 100644
--- a/net/ssl/default_channel_id_store.cc
+++ b/net/ssl/default_channel_id_store.cc
@@ -41,8 +41,8 @@ class DefaultChannelIDStore::GetChannelIDTask
public:
GetChannelIDTask(const std::string& server_identifier,
const GetChannelIDCallback& callback);
- virtual ~GetChannelIDTask();
- virtual void Run(DefaultChannelIDStore* store) override;
+ ~GetChannelIDTask() override;
+ void Run(DefaultChannelIDStore* store) override;
private:
std::string server_identifier_;
@@ -83,8 +83,8 @@ class DefaultChannelIDStore::SetChannelIDTask
base::Time expiration_time,
const std::string& private_key,
const std::string& cert);
- virtual ~SetChannelIDTask();
- virtual void Run(DefaultChannelIDStore* store) override;
+ ~SetChannelIDTask() override;
+ void Run(DefaultChannelIDStore* store) override;
private:
std::string server_identifier_;
@@ -123,8 +123,8 @@ class DefaultChannelIDStore::DeleteChannelIDTask
public:
DeleteChannelIDTask(const std::string& server_identifier,
const base::Closure& callback);
- virtual ~DeleteChannelIDTask();
- virtual void Run(DefaultChannelIDStore* store) override;
+ ~DeleteChannelIDTask() override;
+ void Run(DefaultChannelIDStore* store) override;
private:
std::string server_identifier_;
@@ -158,8 +158,8 @@ class DefaultChannelIDStore::DeleteAllCreatedBetweenTask
DeleteAllCreatedBetweenTask(base::Time delete_begin,
base::Time delete_end,
const base::Closure& callback);
- virtual ~DeleteAllCreatedBetweenTask();
- virtual void Run(DefaultChannelIDStore* store) override;
+ ~DeleteAllCreatedBetweenTask() override;
+ void Run(DefaultChannelIDStore* store) override;
private:
base::Time delete_begin_;
@@ -194,8 +194,8 @@ class DefaultChannelIDStore::GetAllChannelIDsTask
: public DefaultChannelIDStore::Task {
public:
explicit GetAllChannelIDsTask(const GetChannelIDListCallback& callback);
- virtual ~GetAllChannelIDsTask();
- virtual void Run(DefaultChannelIDStore* store) override;
+ ~GetAllChannelIDsTask() override;
+ void Run(DefaultChannelIDStore* store) override;
private:
std::string server_identifier_;
diff --git a/net/ssl/default_channel_id_store.h b/net/ssl/default_channel_id_store.h
index 3882c1f..9b98637 100644
--- a/net/ssl/default_channel_id_store.h
+++ b/net/ssl/default_channel_id_store.h
@@ -41,33 +41,28 @@ class NET_EXPORT DefaultChannelIDStore : public ChannelIDStore {
// backing store will be updated.
explicit DefaultChannelIDStore(PersistentStore* store);
- virtual ~DefaultChannelIDStore();
+ ~DefaultChannelIDStore() override;
// ChannelIDStore implementation.
- virtual int GetChannelID(
- const std::string& server_identifier,
- base::Time* expiration_time,
- std::string* private_key_result,
- std::string* cert_result,
- const GetChannelIDCallback& callback) override;
- virtual void SetChannelID(
- const std::string& server_identifier,
- base::Time creation_time,
- base::Time expiration_time,
- const std::string& private_key,
- const std::string& cert) override;
- virtual void DeleteChannelID(
- const std::string& server_identifier,
- const base::Closure& callback) override;
- virtual void DeleteAllCreatedBetween(
- base::Time delete_begin,
- base::Time delete_end,
- const base::Closure& callback) override;
- virtual void DeleteAll(const base::Closure& callback) override;
- virtual void GetAllChannelIDs(
- const GetChannelIDListCallback& callback) override;
- virtual int GetChannelIDCount() override;
- virtual void SetForceKeepSessionState() override;
+ int GetChannelID(const std::string& server_identifier,
+ base::Time* expiration_time,
+ std::string* private_key_result,
+ std::string* cert_result,
+ const GetChannelIDCallback& callback) override;
+ void SetChannelID(const std::string& server_identifier,
+ base::Time creation_time,
+ base::Time expiration_time,
+ const std::string& private_key,
+ const std::string& cert) override;
+ void DeleteChannelID(const std::string& server_identifier,
+ const base::Closure& callback) override;
+ void DeleteAllCreatedBetween(base::Time delete_begin,
+ base::Time delete_end,
+ const base::Closure& callback) override;
+ void DeleteAll(const base::Closure& callback) override;
+ void GetAllChannelIDs(const GetChannelIDListCallback& callback) override;
+ int GetChannelIDCount() override;
+ void SetForceKeepSessionState() override;
private:
class Task;
diff --git a/net/ssl/default_channel_id_store_unittest.cc b/net/ssl/default_channel_id_store_unittest.cc
index 9429753..ae27a19 100644
--- a/net/ssl/default_channel_id_store_unittest.cc
+++ b/net/ssl/default_channel_id_store_unittest.cc
@@ -69,15 +69,15 @@ class MockPersistentStore
MockPersistentStore();
// DefaultChannelIDStore::PersistentStore implementation.
- virtual void Load(const LoadedCallback& loaded_callback) override;
- virtual void AddChannelID(
+ void Load(const LoadedCallback& loaded_callback) override;
+ void AddChannelID(
const DefaultChannelIDStore::ChannelID& channel_id) override;
- virtual void DeleteChannelID(
+ void DeleteChannelID(
const DefaultChannelIDStore::ChannelID& channel_id) override;
- virtual void SetForceKeepSessionState() override;
+ void SetForceKeepSessionState() override;
protected:
- virtual ~MockPersistentStore();
+ ~MockPersistentStore() override;
private:
typedef std::map<std::string, DefaultChannelIDStore::ChannelID>
diff --git a/net/ssl/ssl_client_auth_cache.h b/net/ssl/ssl_client_auth_cache.h
index 4ee47ed..53d5312 100644
--- a/net/ssl/ssl_client_auth_cache.h
+++ b/net/ssl/ssl_client_auth_cache.h
@@ -28,7 +28,7 @@ class X509Certificate;
class NET_EXPORT_PRIVATE SSLClientAuthCache : public CertDatabase::Observer {
public:
SSLClientAuthCache();
- virtual ~SSLClientAuthCache();
+ ~SSLClientAuthCache() override;
// Checks for a client certificate preference for SSL server at |server|.
// Returns true if a preference is found, and sets |*certificate| to the
@@ -48,7 +48,7 @@ class NET_EXPORT_PRIVATE SSLClientAuthCache : public CertDatabase::Observer {
void Remove(const HostPortPair& server);
// CertDatabase::Observer methods:
- virtual void OnCertAdded(const X509Certificate* cert) override;
+ void OnCertAdded(const X509Certificate* cert) override;
private:
typedef HostPortPair AuthCacheKey;
diff --git a/net/ssl/ssl_config_service_defaults.h b/net/ssl/ssl_config_service_defaults.h
index ff58029d..de867da 100644
--- a/net/ssl/ssl_config_service_defaults.h
+++ b/net/ssl/ssl_config_service_defaults.h
@@ -18,10 +18,10 @@ class NET_EXPORT SSLConfigServiceDefaults : public SSLConfigService {
SSLConfigServiceDefaults();
// Store default SSL config settings in |config|.
- virtual void GetSSLConfig(SSLConfig* config) override;
+ void GetSSLConfig(SSLConfig* config) override;
private:
- virtual ~SSLConfigServiceDefaults();
+ ~SSLConfigServiceDefaults() override;
// Default value of prefs.
const SSLConfig default_config_;
diff --git a/net/ssl/ssl_config_service_unittest.cc b/net/ssl/ssl_config_service_unittest.cc
index 0d9659c..7306c68 100644
--- a/net/ssl/ssl_config_service_unittest.cc
+++ b/net/ssl/ssl_config_service_unittest.cc
@@ -19,9 +19,7 @@ class MockSSLConfigService : public SSLConfigService {
explicit MockSSLConfigService(const SSLConfig& config) : config_(config) {}
// SSLConfigService implementation
- virtual void GetSSLConfig(SSLConfig* config) override {
- *config = config_;
- }
+ void GetSSLConfig(SSLConfig* config) override { *config = config_; }
// Sets the SSLConfig to be returned by GetSSLConfig and processes any
// updates.
@@ -32,7 +30,7 @@ class MockSSLConfigService : public SSLConfigService {
}
private:
- virtual ~MockSSLConfigService() {}
+ ~MockSSLConfigService() override {}
SSLConfig config_;
};