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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.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
« no previous file with comments | « chrome/browser/media_galleries/fileapi/native_media_file_util.h ('k') | chrome/browser/media_galleries/fileapi/picasa_file_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc
diff --git a/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc b/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc
index 2308f8ae8dfec7c6fcaa028b355d70d40ea65474..31b1982670d978c614658018461fadd164a9831d 100644
--- a/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc
@@ -137,7 +137,7 @@ class TestPicasaDataProvider : public PicasaDataProvider {
invalidate_callback_ = callback;
}
- virtual void InvalidateData() OVERRIDE {
+ virtual void InvalidateData() override {
PicasaDataProvider::InvalidateData();
if (!invalidate_callback_.is_null()) {
@@ -154,7 +154,7 @@ class TestPicasaDataProvider : public PicasaDataProvider {
private:
virtual void OnTempDirWatchStarted(
- scoped_ptr<base::FilePathWatcher> temp_dir_watcher) OVERRIDE {
+ scoped_ptr<base::FilePathWatcher> temp_dir_watcher) override {
PicasaDataProvider::OnTempDirWatchStarted(temp_dir_watcher.Pass());
file_watch_request_returned_ = true;
@@ -279,10 +279,10 @@ class PicasaDataProviderTest : public InProcessBrowserTest {
class PicasaDataProviderNoDatabaseGetListTest : public PicasaDataProviderTest {
protected:
- virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE {
+ virtual PicasaDataProvider::DataType RequestedDataType() const override {
return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA;
}
- virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+ virtual void VerifyRefreshResults(bool parse_success) override {
EXPECT_FALSE(parse_success);
TestDone();
}
@@ -296,10 +296,10 @@ IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetListTest,
class PicasaDataProviderNoDatabaseGetAlbumsImagesTest
: public PicasaDataProviderTest {
protected:
- virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE {
+ virtual PicasaDataProvider::DataType RequestedDataType() const override {
return PicasaDataProvider::ALBUMS_IMAGES_DATA;
}
- virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+ virtual void VerifyRefreshResults(bool parse_success) override {
EXPECT_FALSE(parse_success);
TestDone();
}
@@ -312,16 +312,16 @@ IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetAlbumsImagesTest,
class PicasaDataProviderGetListTest : public PicasaDataProviderTest {
protected:
- virtual void InitializeTestData() OVERRIDE {
+ virtual void InitializeTestData() override {
WriteTestAlbumTable(GetColumnFileDestination(), test_folder_1_path(),
test_folder_2_path());
}
- virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE {
+ virtual PicasaDataProvider::DataType RequestedDataType() const override {
return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA;
}
- virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+ virtual void VerifyRefreshResults(bool parse_success) override {
ASSERT_TRUE(parse_success);
VerifyTestAlbumTable(
data_provider(), test_folder_1_path(), test_folder_2_path());
@@ -335,17 +335,17 @@ IN_PROC_BROWSER_TEST_F(PicasaDataProviderGetListTest, GetListTest) {
class PicasaDataProviderGetAlbumsImagesTest : public PicasaDataProviderTest {
protected:
- virtual void InitializeTestData() OVERRIDE {
+ virtual void InitializeTestData() override {
WriteTestAlbumTable(GetColumnFileDestination(), test_folder_1_path(),
test_folder_2_path());
WriteTestAlbumsImagesIndex(test_folder_1_path(), test_folder_2_path());
}
- virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE {
+ virtual PicasaDataProvider::DataType RequestedDataType() const override {
return PicasaDataProvider::ALBUMS_IMAGES_DATA;
}
- virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+ virtual void VerifyRefreshResults(bool parse_success) override {
ASSERT_TRUE(parse_success);
VerifyTestAlbumTable(
data_provider(), test_folder_1_path(), test_folder_2_path());
@@ -366,13 +366,13 @@ class PicasaDataProviderMultipleMixedCallbacksTest
PicasaDataProviderMultipleMixedCallbacksTest()
: list_callbacks_called_(0), albums_images_callbacks_called_(0) {}
- virtual void InitializeTestData() OVERRIDE {
+ virtual void InitializeTestData() override {
WriteTestAlbumTable(GetColumnFileDestination(), test_folder_1_path(),
test_folder_2_path());
WriteTestAlbumsImagesIndex(test_folder_1_path(), test_folder_2_path());
}
- virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE {
+ virtual PicasaDataProvider::DataType RequestedDataType() const override {
return PicasaDataProvider::ALBUMS_IMAGES_DATA;
}
@@ -404,7 +404,7 @@ class PicasaDataProviderMultipleMixedCallbacksTest
TestDone();
}
- virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+ virtual void StartTestOnMediaTaskRunner() override {
DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
data_provider()->RefreshData(
@@ -466,12 +466,12 @@ class PicasaDataProviderFileWatcherInvalidateTest
data_provider()->MoveTempFilesToDatabase();
}
- virtual base::FilePath GetColumnFileDestination() const OVERRIDE {
+ virtual base::FilePath GetColumnFileDestination() const override {
return GetTempDirPath();
}
private:
- virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+ virtual void StartTestOnMediaTaskRunner() override {
DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
// Refresh before moving album table to database dir, guaranteeing failure.
@@ -492,10 +492,10 @@ class PicasaDataProviderInvalidateInflightTableReaderTest
: public PicasaDataProviderGetListTest {
protected:
// Don't write the database files until later.
- virtual void InitializeTestData() OVERRIDE {}
+ virtual void InitializeTestData() override {}
private:
- virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+ virtual void StartTestOnMediaTaskRunner() override {
DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
// Refresh before the database files have been written.
@@ -541,7 +541,7 @@ class PicasaDataProviderInvalidateInflightAlbumsIndexerTest
}
private:
- virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+ virtual void StartTestOnMediaTaskRunner() override {
DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
data_provider()->RefreshData(
« no previous file with comments | « chrome/browser/media_galleries/fileapi/native_media_file_util.h ('k') | chrome/browser/media_galleries/fileapi/picasa_file_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698