| Index: chrome/browser/content_settings/content_settings_mock_provider.h
|
| diff --git a/chrome/browser/content_settings/content_settings_mock_provider.h b/chrome/browser/content_settings/content_settings_mock_provider.h
|
| index e0dc6940d34117c036f6478f5454392df687838e..59303ce13b7d6f79844a51d26ec9ea328391d9f7 100644
|
| --- a/chrome/browser/content_settings/content_settings_mock_provider.h
|
| +++ b/chrome/browser/content_settings/content_settings_mock_provider.h
|
| @@ -25,7 +25,7 @@ class MockProvider : public ObservableProvider {
|
| virtual RuleIterator* GetRuleIterator(
|
| ContentSettingsType content_type,
|
| const ResourceIdentifier& resource_identifier,
|
| - bool incognito) const OVERRIDE;
|
| + bool incognito) const override;
|
|
|
| // The MockProvider is only able to store one content setting. So every time
|
| // this method is called the previously set content settings is overwritten.
|
| @@ -34,12 +34,12 @@ class MockProvider : public ObservableProvider {
|
| const ContentSettingsPattern& embedding_url_pattern,
|
| ContentSettingsType content_type,
|
| const ResourceIdentifier& resource_identifier,
|
| - base::Value* value) OVERRIDE;
|
| + base::Value* value) override;
|
|
|
| virtual void ClearAllContentSettingsRules(
|
| - ContentSettingsType content_type) OVERRIDE {}
|
| + ContentSettingsType content_type) override {}
|
|
|
| - virtual void ShutdownOnUIThread() OVERRIDE;
|
| + virtual void ShutdownOnUIThread() override;
|
|
|
| void set_read_only(bool read_only) {
|
| read_only_ = read_only;
|
|
|