diff options
Diffstat (limited to 'chrome/browser/extensions/api/storage')
9 files changed, 53 insertions, 53 deletions
diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc index 4ee4ee9..2454126 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.cc +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.cc @@ -77,11 +77,11 @@ class ManagedValueStoreCache::ExtensionTracker const Extension* extension, bool is_update, bool from_ephemeral, - const std::string& old_name) OVERRIDE; + const std::string& old_name) override; virtual void OnExtensionUninstalled( content::BrowserContext* browser_context, const Extension* extension, - extensions::UninstallReason reason) OVERRIDE; + extensions::UninstallReason reason) override; // Handler for the signal from ExtensionSystem::ready(). void OnExtensionsReady(); diff --git a/chrome/browser/extensions/api/storage/managed_value_store_cache.h b/chrome/browser/extensions/api/storage/managed_value_store_cache.h index ec44392..b33407c 100644 --- a/chrome/browser/extensions/api/storage/managed_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/managed_value_store_cache.h @@ -56,17 +56,17 @@ class ManagedValueStoreCache : public ValueStoreCache, PolicyValueStoreMap; // ValueStoreCache implementation: - virtual void ShutdownOnUI() OVERRIDE; + virtual void ShutdownOnUI() override; virtual void RunWithValueStoreForExtension( const StorageCallback& callback, - scoped_refptr<const Extension> extension) OVERRIDE; - virtual void DeleteStorageSoon(const std::string& extension_id) OVERRIDE; + scoped_refptr<const Extension> extension) override; + virtual void DeleteStorageSoon(const std::string& extension_id) override; // PolicyService::Observer implementation: - virtual void OnPolicyServiceInitialized(policy::PolicyDomain domain) OVERRIDE; + virtual void OnPolicyServiceInitialized(policy::PolicyDomain domain) override; virtual void OnPolicyUpdated(const policy::PolicyNamespace& ns, const policy::PolicyMap& previous, - const policy::PolicyMap& current) OVERRIDE; + const policy::PolicyMap& current) override; // Posted by OnPolicyUpdated() to update a PolicyValueStore on the FILE // thread. diff --git a/chrome/browser/extensions/api/storage/policy_value_store.h b/chrome/browser/extensions/api/storage/policy_value_store.h index bc14b97..ee2c55a 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store.h +++ b/chrome/browser/extensions/api/storage/policy_value_store.h @@ -40,24 +40,24 @@ class PolicyValueStore : public ValueStore { void DeleteStorage(); // ValueStore implementation: - virtual size_t GetBytesInUse(const std::string& key) OVERRIDE; - virtual size_t GetBytesInUse(const std::vector<std::string>& keys) OVERRIDE; - virtual size_t GetBytesInUse() OVERRIDE; - virtual ReadResult Get(const std::string& key) OVERRIDE; - virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE; - virtual ReadResult Get() OVERRIDE; + virtual size_t GetBytesInUse(const std::string& key) override; + virtual size_t GetBytesInUse(const std::vector<std::string>& keys) override; + virtual size_t GetBytesInUse() override; + virtual ReadResult Get(const std::string& key) override; + virtual ReadResult Get(const std::vector<std::string>& keys) override; + virtual ReadResult Get() override; virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE; - virtual WriteResult Remove(const std::string& key) OVERRIDE; - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE; - virtual WriteResult Clear() OVERRIDE; + WriteOptions options, const base::DictionaryValue& values) override; + virtual WriteResult Remove(const std::string& key) override; + virtual WriteResult Remove(const std::vector<std::string>& keys) override; + virtual WriteResult Clear() override; // Hopefully, as a Read-Only database, there is no reason to use these. - virtual bool Restore() OVERRIDE; - virtual bool RestoreKey(const std::string& key) OVERRIDE; + virtual bool Restore() override; + virtual bool RestoreKey(const std::string& key) override; // For unit tests. ValueStore* delegate() { return delegate_.get(); } diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc index 7dd88203..1af72db 100644 --- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc +++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc @@ -50,24 +50,24 @@ class MutablePolicyValueStore : public PolicyValueStore { virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE { + const base::Value& value) override { return delegate()->Set(options, key, value); } virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE { + WriteOptions options, const base::DictionaryValue& values) override { return delegate()->Set(options, values); } - virtual WriteResult Remove(const std::string& key) OVERRIDE { + virtual WriteResult Remove(const std::string& key) override { return delegate()->Remove(key); } - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE { + virtual WriteResult Remove(const std::vector<std::string>& keys) override { return delegate()->Remove(keys); } - virtual WriteResult Clear() OVERRIDE { + virtual WriteResult Clear() override { return delegate()->Clear(); } @@ -92,7 +92,7 @@ class PolicyValueStoreTest : public testing::Test { : file_thread_(content::BrowserThread::FILE, &loop_) {} virtual ~PolicyValueStoreTest() {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(scoped_temp_dir_.CreateUniqueTempDir()); observers_ = new SettingsObserverList(); observers_->AddObserver(&observer_); @@ -103,7 +103,7 @@ class PolicyValueStoreTest : public testing::Test { new LeveldbValueStore(scoped_temp_dir_.path())))); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { observers_->RemoveObserver(&observer_); store_.reset(); } diff --git a/chrome/browser/extensions/api/storage/settings_apitest.cc b/chrome/browser/extensions/api/storage/settings_apitest.cc index 1a14f39..a1dc479 100644 --- a/chrome/browser/extensions/api/storage/settings_apitest.cc +++ b/chrome/browser/extensions/api/storage/settings_apitest.cc @@ -74,7 +74,7 @@ class MockSchemaRegistryObserver : public policy::SchemaRegistry::Observer { class ExtensionSettingsApiTest : public ExtensionApiTest { protected: - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { + virtual void SetUpInProcessBrowserTestFixture() override { ExtensionApiTest::SetUpInProcessBrowserTestFixture(); #if defined(ENABLE_CONFIGURATION_POLICY) diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc index baa0def..f3d3564 100644 --- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc +++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc @@ -97,7 +97,7 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor { // syncer::SyncChangeProcessor implementation. virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const syncer::SyncChangeList& change_list) OVERRIDE { + const syncer::SyncChangeList& change_list) override { if (fail_all_requests_) { return syncer::SyncError( FROM_HERE, @@ -113,7 +113,7 @@ class MockSyncChangeProcessor : public syncer::SyncChangeProcessor { } virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) const - OVERRIDE { + override { return syncer::SyncDataList(); } @@ -172,7 +172,7 @@ class TestingValueStoreFactory : public SettingsStorageFactory { // SettingsStorageFactory implementation. virtual ValueStore* Create(const base::FilePath& base_path, - const std::string& extension_id) OVERRIDE { + const std::string& extension_id) override { TestingValueStore* new_storage = new TestingValueStore(); DCHECK(!created_.count(extension_id)); created_[extension_id] = new_storage; @@ -183,7 +183,7 @@ class TestingValueStoreFactory : public SettingsStorageFactory { // any files. virtual void DeleteDatabaseIfExists( const base::FilePath& base_path, - const std::string& extension_id) OVERRIDE {} + const std::string& extension_id) override {} private: // SettingsStorageFactory is refcounted. @@ -206,7 +206,7 @@ class ExtensionSettingsSyncTest : public testing::Test { sync_processor_wrapper_(new syncer::SyncChangeProcessorWrapperForTest( sync_processor_.get())) {} - virtual void SetUp() OVERRIDE { + virtual void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); profile_.reset(new TestingProfile(temp_dir_.path())); storage_factory_->Reset(new LeveldbSettingsStorageFactory()); @@ -219,7 +219,7 @@ class ExtensionSettingsSyncTest : public testing::Test { profile_.get(), &util::MockExtensionSystemWithEventRouter::Build); } - virtual void TearDown() OVERRIDE { + virtual void TearDown() override { frontend_.reset(); profile_.reset(); // Execute any pending deletion tasks. diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.h b/chrome/browser/extensions/api/storage/sync_storage_backend.h index 72f954c..ad81677 100644 --- a/chrome/browser/extensions/api/storage/sync_storage_backend.h +++ b/chrome/browser/extensions/api/storage/sync_storage_backend.h @@ -52,16 +52,16 @@ class SyncStorageBackend : public syncer::SyncableService { // syncer::SyncableService implementation. virtual syncer::SyncDataList GetAllSyncData(syncer::ModelType type) - const OVERRIDE; + const override; virtual syncer::SyncMergeResult MergeDataAndStartSyncing( syncer::ModelType type, const syncer::SyncDataList& initial_sync_data, scoped_ptr<syncer::SyncChangeProcessor> sync_processor, - scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) OVERRIDE; + scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) override; virtual syncer::SyncError ProcessSyncChanges( const tracked_objects::Location& from_here, - const syncer::SyncChangeList& change_list) OVERRIDE; - virtual void StopSyncing(syncer::ModelType type) OVERRIDE; + const syncer::SyncChangeList& change_list) override; + virtual void StopSyncing(syncer::ModelType type) override; private: // Gets a weak reference to the storage area for a given extension, diff --git a/chrome/browser/extensions/api/storage/sync_value_store_cache.h b/chrome/browser/extensions/api/storage/sync_value_store_cache.h index 0a66032..a66300c 100644 --- a/chrome/browser/extensions/api/storage/sync_value_store_cache.h +++ b/chrome/browser/extensions/api/storage/sync_value_store_cache.h @@ -41,8 +41,8 @@ class SyncValueStoreCache : public ValueStoreCache { // ValueStoreCache implementation: virtual void RunWithValueStoreForExtension( const StorageCallback& callback, - scoped_refptr<const Extension> extension) OVERRIDE; - virtual void DeleteStorageSoon(const std::string& extension_id) OVERRIDE; + scoped_refptr<const Extension> extension) override; + virtual void DeleteStorageSoon(const std::string& extension_id) override; private: void InitOnFileThread(const scoped_refptr<SettingsStorageFactory>& factory, diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.h b/chrome/browser/extensions/api/storage/syncable_settings_storage.h index b6d6de4..b278aca 100644 --- a/chrome/browser/extensions/api/storage/syncable_settings_storage.h +++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.h @@ -34,23 +34,23 @@ class SyncableSettingsStorage : public ValueStore { virtual ~SyncableSettingsStorage(); // ValueStore implementation. - virtual size_t GetBytesInUse(const std::string& key) OVERRIDE; - virtual size_t GetBytesInUse(const std::vector<std::string>& keys) OVERRIDE; - virtual size_t GetBytesInUse() OVERRIDE; - virtual ReadResult Get(const std::string& key) OVERRIDE; - virtual ReadResult Get(const std::vector<std::string>& keys) OVERRIDE; - virtual ReadResult Get() OVERRIDE; + virtual size_t GetBytesInUse(const std::string& key) override; + virtual size_t GetBytesInUse(const std::vector<std::string>& keys) override; + virtual size_t GetBytesInUse() override; + virtual ReadResult Get(const std::string& key) override; + virtual ReadResult Get(const std::vector<std::string>& keys) override; + virtual ReadResult Get() override; virtual WriteResult Set( WriteOptions options, const std::string& key, - const base::Value& value) OVERRIDE; + const base::Value& value) override; virtual WriteResult Set( - WriteOptions options, const base::DictionaryValue& values) OVERRIDE; - virtual WriteResult Remove(const std::string& key) OVERRIDE; - virtual WriteResult Remove(const std::vector<std::string>& keys) OVERRIDE; - virtual WriteResult Clear() OVERRIDE; - virtual bool Restore() OVERRIDE; - virtual bool RestoreKey(const std::string& key) OVERRIDE; + WriteOptions options, const base::DictionaryValue& values) override; + virtual WriteResult Remove(const std::string& key) override; + virtual WriteResult Remove(const std::vector<std::string>& keys) override; + virtual WriteResult Clear() override; + virtual bool Restore() override; + virtual bool RestoreKey(const std::string& key) override; // Sync-related methods, analogous to those on SyncableService (handled by // ExtensionSettings), but with looser guarantees about when the methods |