Index: net/ssl/channel_id_service_unittest.cc |
diff --git a/net/ssl/channel_id_service_unittest.cc b/net/ssl/channel_id_service_unittest.cc |
index 52083e8e8bc206cfbe3b9342b85cb95ffdc925fd..b5fc006f1b3904bd3ac2305797316384db316647 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, |