| Index: chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc
|
| index 610f5fe06370b4315c937736e06e863e09743911..b773ee3b725503b3212891140d85c69dea1f357c 100644
|
| --- a/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/picasa_file_util_unittest.cc
|
| @@ -192,7 +192,7 @@ class TestPicasaFileUtil : public PicasaFileUtil {
|
| }
|
| virtual ~TestPicasaFileUtil() {}
|
| private:
|
| - virtual PicasaDataProvider* GetDataProvider() OVERRIDE {
|
| + virtual PicasaDataProvider* GetDataProvider() override {
|
| return data_provider_;
|
| }
|
|
|
| @@ -208,7 +208,7 @@ class TestMediaFileSystemBackend : public MediaFileSystemBackend {
|
| test_file_util_(picasa_file_util) {}
|
|
|
| virtual storage::AsyncFileUtil* GetAsyncFileUtil(
|
| - storage::FileSystemType type) OVERRIDE {
|
| + storage::FileSystemType type) override {
|
| if (type != storage::kFileSystemTypePicasa)
|
| return NULL;
|
|
|
| @@ -226,7 +226,7 @@ class PicasaFileUtilTest : public testing::Test {
|
| }
|
| virtual ~PicasaFileUtilTest() {}
|
|
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| ASSERT_TRUE(profile_dir_.CreateUniqueTempDir());
|
| ImportedMediaGalleryRegistry::GetInstance()->Initialize();
|
|
|
| @@ -256,7 +256,7 @@ class PicasaFileUtilTest : public testing::Test {
|
| content::CreateAllowFileAccessOptions());
|
| }
|
|
|
| - virtual void TearDown() OVERRIDE {
|
| + virtual void TearDown() override {
|
| SynchronouslyRunOnMediaTaskRunner(
|
| base::Bind(&PicasaFileUtilTest::TearDownOnMediaTaskRunner,
|
| base::Unretained(this)));
|
|
|