| Index: chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
|
| diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
|
| index bfc5f71a392c9c52f32f083b3466816f77527804..e9edc4b07efa1bc92d0d6f040935cb51f07deac3 100644
|
| --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
|
| +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc
|
| @@ -63,32 +63,32 @@ class MockGalleryChangeObserver
|
| // MediaGalleriesPreferences::GalleryChangeObserver implementation.
|
| virtual void OnPermissionAdded(MediaGalleriesPreferences* pref,
|
| const std::string& extension_id,
|
| - MediaGalleryPrefId pref_id) OVERRIDE {
|
| + MediaGalleryPrefId pref_id) override {
|
| EXPECT_EQ(pref_, pref);
|
| ++notifications_;
|
| }
|
|
|
| virtual void OnPermissionRemoved(MediaGalleriesPreferences* pref,
|
| const std::string& extension_id,
|
| - MediaGalleryPrefId pref_id) OVERRIDE {
|
| + MediaGalleryPrefId pref_id) override {
|
| EXPECT_EQ(pref_, pref);
|
| ++notifications_;
|
| }
|
|
|
| virtual void OnGalleryAdded(MediaGalleriesPreferences* pref,
|
| - MediaGalleryPrefId pref_id) OVERRIDE {
|
| + MediaGalleryPrefId pref_id) override {
|
| EXPECT_EQ(pref_, pref);
|
| ++notifications_;
|
| }
|
|
|
| virtual void OnGalleryRemoved(MediaGalleriesPreferences* pref,
|
| - MediaGalleryPrefId pref_id) OVERRIDE {
|
| + MediaGalleryPrefId pref_id) override {
|
| EXPECT_EQ(pref_, pref);
|
| ++notifications_;
|
| }
|
|
|
| virtual void OnGalleryInfoUpdated(MediaGalleriesPreferences* pref,
|
| - MediaGalleryPrefId pref_id) OVERRIDE {
|
| + MediaGalleryPrefId pref_id) override {
|
| EXPECT_EQ(pref_, pref);
|
| ++notifications_;
|
| }
|
| @@ -114,7 +114,7 @@ class MediaGalleriesPreferencesTest : public testing::Test {
|
| virtual ~MediaGalleriesPreferencesTest() {
|
| }
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());
|
|
|
| extensions::TestExtensionSystem* extension_system(
|
| @@ -148,7 +148,7 @@ class MediaGalleriesPreferencesTest : public testing::Test {
|
| AddMediaGalleriesApp("no", read_permissions, profile_.get());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| Verify();
|
| TestStorageMonitor::Destroy();
|
| }
|
|
|