| Index: content/browser/indexed_db/indexed_db_backing_store_unittest.cc
|
| diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc
|
| index b6f829704070ba146949691492718455cd9021ec..e4a232202e7beb9919997d6bd86303767cf8ad01 100644
|
| --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc
|
| +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc
|
| @@ -34,24 +34,23 @@ namespace {
|
|
|
| class Comparator : public LevelDBComparator {
|
| public:
|
| - virtual int Compare(const base::StringPiece& a,
|
| - const base::StringPiece& b) const override {
|
| + int Compare(const base::StringPiece& a,
|
| + const base::StringPiece& b) const override {
|
| return content::Compare(a, b, false /*index_keys*/);
|
| }
|
| - virtual const char* Name() const override { return "idb_cmp1"; }
|
| + const char* Name() const override { return "idb_cmp1"; }
|
| };
|
|
|
| class DefaultLevelDBFactory : public LevelDBFactory {
|
| public:
|
| DefaultLevelDBFactory() {}
|
| - virtual leveldb::Status OpenLevelDB(const base::FilePath& file_name,
|
| - const LevelDBComparator* comparator,
|
| - scoped_ptr<LevelDBDatabase>* db,
|
| - bool* is_disk_full) override {
|
| + leveldb::Status OpenLevelDB(const base::FilePath& file_name,
|
| + const LevelDBComparator* comparator,
|
| + scoped_ptr<LevelDBDatabase>* db,
|
| + bool* is_disk_full) override {
|
| return LevelDBDatabase::Open(file_name, comparator, db, is_disk_full);
|
| }
|
| - virtual leveldb::Status DestroyLevelDB(
|
| - const base::FilePath& file_name) override {
|
| + leveldb::Status DestroyLevelDB(const base::FilePath& file_name) override {
|
| return LevelDBDatabase::Destroy(file_name);
|
| }
|
|
|
| @@ -114,9 +113,9 @@ class TestableIndexedDBBackingStore : public IndexedDBBackingStore {
|
| void ClearRemovals() { removals_.clear(); }
|
|
|
| protected:
|
| - virtual ~TestableIndexedDBBackingStore() {}
|
| + ~TestableIndexedDBBackingStore() override {}
|
|
|
| - virtual bool WriteBlobFile(
|
| + bool WriteBlobFile(
|
| int64 database_id,
|
| const Transaction::WriteDescriptor& descriptor,
|
| Transaction::ChainedBlobWriter* chained_blob_writer) override {
|
| @@ -137,7 +136,7 @@ class TestableIndexedDBBackingStore : public IndexedDBBackingStore {
|
| return true;
|
| }
|
|
|
| - virtual bool RemoveBlobFile(int64 database_id, int64 key) override {
|
| + bool RemoveBlobFile(int64 database_id, int64 key) override {
|
| if (database_id_ != database_id ||
|
| !KeyPrefix::IsValidDatabaseId(database_id)) {
|
| return false;
|
| @@ -147,7 +146,7 @@ class TestableIndexedDBBackingStore : public IndexedDBBackingStore {
|
| }
|
|
|
| // Timers don't play nicely with unit tests.
|
| - virtual void StartJournalCleaningTimer() override {
|
| + void StartJournalCleaningTimer() override {
|
| CleanPrimaryJournalIgnoreReturn();
|
| }
|
|
|
| @@ -201,9 +200,9 @@ class TestIDBFactory : public IndexedDBFactoryImpl {
|
| }
|
|
|
| protected:
|
| - virtual ~TestIDBFactory() {}
|
| + ~TestIDBFactory() override {}
|
|
|
| - virtual scoped_refptr<IndexedDBBackingStore> OpenBackingStoreHelper(
|
| + scoped_refptr<IndexedDBBackingStore> OpenBackingStoreHelper(
|
| const GURL& origin_url,
|
| const base::FilePath& data_directory,
|
| net::URLRequestContext* request_context,
|
| @@ -359,7 +358,7 @@ class IndexedDBBackingStoreTest : public testing::Test {
|
| class TestCallback : public IndexedDBBackingStore::BlobWriteCallback {
|
| public:
|
| TestCallback() : called(false), succeeded(false) {}
|
| - virtual void Run(bool succeeded_in) override {
|
| + void Run(bool succeeded_in) override {
|
| called = true;
|
| succeeded = succeeded_in;
|
| }
|
| @@ -367,7 +366,7 @@ class TestCallback : public IndexedDBBackingStore::BlobWriteCallback {
|
| bool succeeded;
|
|
|
| protected:
|
| - virtual ~TestCallback() {}
|
| + ~TestCallback() override {}
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(TestCallback);
|
|
|