| Index: content/browser/database_tracker_unittest.cc
|
| diff --git a/content/browser/database_tracker_unittest.cc b/content/browser/database_tracker_unittest.cc
|
| index f456811e27a928a65b6683c21da6eeecddd9f76c..14557de29c85f2372b8ae0ea72b17f7a76668e59 100644
|
| --- a/content/browser/database_tracker_unittest.cc
|
| +++ b/content/browser/database_tracker_unittest.cc
|
| @@ -43,10 +43,10 @@ class TestObserver : public storage::DatabaseTracker::Observer {
|
| observe_scheduled_deletions_(observe_scheduled_deletions) {
|
| }
|
|
|
| - virtual ~TestObserver() {}
|
| - virtual void OnDatabaseSizeChanged(const std::string& origin_identifier,
|
| - const base::string16& database_name,
|
| - int64 database_size) override {
|
| + ~TestObserver() override {}
|
| + void OnDatabaseSizeChanged(const std::string& origin_identifier,
|
| + const base::string16& database_name,
|
| + int64 database_size) override {
|
| if (!observe_size_changes_)
|
| return;
|
| new_notification_received_ = true;
|
| @@ -54,7 +54,7 @@ class TestObserver : public storage::DatabaseTracker::Observer {
|
| database_name_ = database_name;
|
| database_size_ = database_size;
|
| }
|
| - virtual void OnDatabaseScheduledForDeletion(
|
| + void OnDatabaseScheduledForDeletion(
|
| const std::string& origin_identifier,
|
| const base::string16& database_name) override {
|
| if (!observe_scheduled_deletions_)
|
| @@ -103,23 +103,23 @@ class TestQuotaManagerProxy : public storage::QuotaManagerProxy {
|
| registered_client_(NULL) {
|
| }
|
|
|
| - virtual void RegisterClient(storage::QuotaClient* client) override {
|
| + void RegisterClient(storage::QuotaClient* client) override {
|
| EXPECT_FALSE(registered_client_);
|
| registered_client_ = client;
|
| }
|
|
|
| - virtual void NotifyStorageAccessed(storage::QuotaClient::ID client_id,
|
| - const GURL& origin,
|
| - storage::StorageType type) override {
|
| + void NotifyStorageAccessed(storage::QuotaClient::ID client_id,
|
| + const GURL& origin,
|
| + storage::StorageType type) override {
|
| EXPECT_EQ(storage::QuotaClient::kDatabase, client_id);
|
| EXPECT_EQ(storage::kStorageTypeTemporary, type);
|
| accesses_[origin] += 1;
|
| }
|
|
|
| - virtual void NotifyStorageModified(storage::QuotaClient::ID client_id,
|
| - const GURL& origin,
|
| - storage::StorageType type,
|
| - int64 delta) override {
|
| + void NotifyStorageModified(storage::QuotaClient::ID client_id,
|
| + const GURL& origin,
|
| + storage::StorageType type,
|
| + int64 delta) override {
|
| EXPECT_EQ(storage::QuotaClient::kDatabase, client_id);
|
| EXPECT_EQ(storage::kStorageTypeTemporary, type);
|
| modifications_[origin].first += 1;
|
| @@ -127,17 +127,16 @@ class TestQuotaManagerProxy : public storage::QuotaManagerProxy {
|
| }
|
|
|
| // Not needed for our tests.
|
| - virtual void NotifyOriginInUse(const GURL& origin) override {}
|
| - virtual void NotifyOriginNoLongerInUse(const GURL& origin) 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 {}
|
| + void NotifyOriginInUse(const GURL& origin) override {}
|
| + void NotifyOriginNoLongerInUse(const GURL& origin) 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 SimulateQuotaManagerDestroyed() {
|
| if (registered_client_) {
|
| @@ -169,9 +168,7 @@ class TestQuotaManagerProxy : public storage::QuotaManagerProxy {
|
| std::map<GURL, std::pair<int, int64> > modifications_;
|
|
|
| protected:
|
| - virtual ~TestQuotaManagerProxy() {
|
| - EXPECT_FALSE(registered_client_);
|
| - }
|
| + ~TestQuotaManagerProxy() override { EXPECT_FALSE(registered_client_); }
|
| };
|
|
|
|
|
|
|