Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(942)

Unified Diff: chrome/browser/media_galleries/media_scan_manager_unittest.cc

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media_galleries/media_scan_manager_unittest.cc
diff --git a/chrome/browser/media_galleries/media_scan_manager_unittest.cc b/chrome/browser/media_galleries/media_scan_manager_unittest.cc
index 54fe47e84edf832ad87643d96cbe0f5a3e1fb7fc..1f445ccc4c7d8ba42d6ae6e4466be46c165d9aec 100644
--- a/chrome/browser/media_galleries/media_scan_manager_unittest.cc
+++ b/chrome/browser/media_galleries/media_scan_manager_unittest.cc
@@ -60,7 +60,7 @@ class MockMediaFolderFinder : MediaFolderFinder {
destruction_callback_.Run();
}
- virtual void StartScan() OVERRIDE {
+ virtual void StartScan() override {
started_callback_.Run(callback_);
}
@@ -103,7 +103,7 @@ class MediaScanManagerTest : public MediaScanManagerObserver,
EXPECT_EQ(find_folders_start_count_, find_folders_destroy_count_);
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
ASSERT_TRUE(storage_monitor::TestStorageMonitor::CreateAndInstall());
extensions::TestExtensionSystem* extension_system(
@@ -138,7 +138,7 @@ class MediaScanManagerTest : public MediaScanManagerObserver,
media_scan_manager_->AddObserver(profile_.get(), this);
}
- virtual void TearDown() OVERRIDE {
+ virtual void TearDown() override {
media_scan_manager_->RemoveObserver(profile_.get());
media_scan_manager_.reset();
storage_monitor::TestStorageMonitor::Destroy();
@@ -234,7 +234,7 @@ class MediaScanManagerTest : public MediaScanManagerObserver,
virtual void OnScanFinished(
const std::string& extension_id,
int gallery_count,
- const MediaGalleryScanResult& file_counts) OVERRIDE {
+ const MediaGalleryScanResult& file_counts) override {
EXPECT_EQ(extension_->id(), extension_id);
EXPECT_EQ(expected_gallery_count_, gallery_count);
EXPECT_EQ(expected_file_counts_.audio_count, file_counts.audio_count);
« no previous file with comments | « chrome/browser/media_galleries/media_scan_manager.h ('k') | chrome/browser/media_galleries/win/mtp_device_delegate_impl_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698