Index: content/browser/appcache/appcache_host_unittest.cc |
diff --git a/content/browser/appcache/appcache_host_unittest.cc b/content/browser/appcache/appcache_host_unittest.cc |
index aed32f4cbedb05e37f370054154b82ef32cd869d..817e8c0c924a6f2053e04d7255eb784f01df1930 100644 |
--- a/content/browser/appcache/appcache_host_unittest.cc |
+++ b/content/browser/appcache/appcache_host_unittest.cc |
@@ -42,43 +42,39 @@ class AppCacheHostTest : public testing::Test { |
content_blocked_(false) { |
} |
- virtual void OnCacheSelected( |
- int host_id, const AppCacheInfo& info) override { |
+ void OnCacheSelected(int host_id, const AppCacheInfo& info) override { |
last_host_id_ = host_id; |
last_cache_id_ = info.cache_id; |
last_status_ = info.status; |
} |
- virtual void OnStatusChanged(const std::vector<int>& host_ids, |
- AppCacheStatus status) override { |
+ void OnStatusChanged(const std::vector<int>& host_ids, |
+ AppCacheStatus status) override { |
last_status_changed_ = status; |
} |
- virtual void OnEventRaised(const std::vector<int>& host_ids, |
- AppCacheEventID event_id) override { |
+ void OnEventRaised(const std::vector<int>& host_ids, |
+ AppCacheEventID event_id) override { |
last_event_id_ = event_id; |
} |
- virtual void OnErrorEventRaised( |
- const std::vector<int>& host_ids, |
- const AppCacheErrorDetails& details) override { |
+ void OnErrorEventRaised(const std::vector<int>& host_ids, |
+ const AppCacheErrorDetails& details) override { |
last_event_id_ = APPCACHE_ERROR_EVENT; |
} |
- virtual void OnProgressEventRaised(const std::vector<int>& host_ids, |
- const GURL& url, |
- int num_total, |
- int num_complete) override { |
+ void OnProgressEventRaised(const std::vector<int>& host_ids, |
+ const GURL& url, |
+ int num_total, |
+ int num_complete) override { |
last_event_id_ = APPCACHE_PROGRESS_EVENT; |
} |
- virtual void OnLogMessage(int host_id, |
- AppCacheLogLevel log_level, |
- const std::string& message) override { |
- } |
+ void OnLogMessage(int host_id, |
+ AppCacheLogLevel log_level, |
+ const std::string& message) override {} |
- virtual void OnContentBlocked(int host_id, |
- const GURL& manifest_url) override { |
+ void OnContentBlocked(int host_id, const GURL& manifest_url) override { |
content_blocked_ = true; |
} |
@@ -95,29 +91,26 @@ class AppCacheHostTest : public testing::Test { |
MockQuotaManagerProxy() : QuotaManagerProxy(NULL, NULL) {} |
// Not needed for our tests. |
- virtual void RegisterClient(storage::QuotaClient* client) override {} |
- virtual void NotifyStorageAccessed(storage::QuotaClient::ID client_id, |
- const GURL& origin, |
- storage::StorageType type) override {} |
- virtual void NotifyStorageModified(storage::QuotaClient::ID client_id, |
- const GURL& origin, |
- storage::StorageType type, |
- int64 delta) override {} |
- virtual void SetUsageCacheEnabled(storage::QuotaClient::ID client_id, |
- const GURL& origin, |
- storage::StorageType type, |
- bool enabled) override {} |
- virtual void GetUsageAndQuota( |
- base::SequencedTaskRunner* original_task_runner, |
- const GURL& origin, |
- storage::StorageType type, |
- const GetUsageAndQuotaCallback& callback) override {} |
- |
- virtual void NotifyOriginInUse(const GURL& origin) override { |
- inuse_[origin] += 1; |
- } |
- |
- virtual void NotifyOriginNoLongerInUse(const GURL& origin) override { |
+ void RegisterClient(storage::QuotaClient* client) override {} |
+ void NotifyStorageAccessed(storage::QuotaClient::ID client_id, |
+ const GURL& origin, |
+ storage::StorageType type) override {} |
+ void NotifyStorageModified(storage::QuotaClient::ID client_id, |
+ const GURL& origin, |
+ storage::StorageType type, |
+ int64 delta) override {} |
+ void SetUsageCacheEnabled(storage::QuotaClient::ID client_id, |
+ const GURL& origin, |
+ storage::StorageType type, |
+ bool enabled) override {} |
+ void GetUsageAndQuota(base::SequencedTaskRunner* original_task_runner, |
+ const GURL& origin, |
+ storage::StorageType type, |
+ const GetUsageAndQuotaCallback& callback) override {} |
+ |
+ void NotifyOriginInUse(const GURL& origin) override { inuse_[origin] += 1; } |
+ |
+ void NotifyOriginNoLongerInUse(const GURL& origin) override { |
inuse_[origin] -= 1; |
} |
@@ -133,7 +126,7 @@ class AppCacheHostTest : public testing::Test { |
std::map<GURL, int> inuse_; |
protected: |
- virtual ~MockQuotaManagerProxy() {} |
+ ~MockQuotaManagerProxy() override {} |
}; |
void GetStatusCallback(AppCacheStatus status, void* param) { |