| Index: chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc
|
| diff --git a/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc b/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc
|
| index 3b6e31ad10593a5fd983277fa2d78151e81892f9..e85143b3a75374f9ae3eb0431fc853397cf358d1 100644
|
| --- a/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc
|
| +++ b/chrome/browser/media_galleries/fileapi/iphoto_data_provider_browsertest.cc
|
| @@ -38,7 +38,7 @@ class TestIPhotoDataProvider : public IPhotoDataProvider {
|
|
|
| private:
|
| virtual void OnLibraryChanged(const base::FilePath& path,
|
| - bool error) OVERRIDE {
|
| + bool error) override {
|
| IPhotoDataProvider::OnLibraryChanged(path, error);
|
| callback_.Run();
|
| }
|
| @@ -54,7 +54,7 @@ class IPhotoDataProviderTest : public InProcessBrowserTest {
|
| virtual ~IPhotoDataProviderTest() {}
|
|
|
| protected:
|
| - virtual void SetUp() OVERRIDE {
|
| + virtual void SetUp() override {
|
| ASSERT_TRUE(library_dir_.CreateUniqueTempDir());
|
| WriteLibraryInternal();
|
| // The ImportedMediaGalleryRegistry is created on which ever thread calls
|
| @@ -158,7 +158,7 @@ class IPhotoDataProviderBasicTest : public IPhotoDataProviderTest {
|
| IPhotoDataProviderBasicTest() {}
|
| virtual ~IPhotoDataProviderBasicTest() {}
|
|
|
| - virtual std::string GetLibraryString() OVERRIDE {
|
| + virtual std::string GetLibraryString() override {
|
| return "<plist><dict>\n"
|
| "<key>List of Albums</key>\n"
|
| "<array>"
|
| @@ -268,7 +268,7 @@ class IPhotoDataProviderBasicTest : public IPhotoDataProviderTest {
|
| "</dict></plist>\n";
|
| }
|
|
|
| - virtual void StartTest(bool parse_success) OVERRIDE {
|
| + virtual void StartTest(bool parse_success) override {
|
| EXPECT_TRUE(parse_success);
|
|
|
| std::vector<std::string> names = data_provider()->GetAlbumNames();
|
| @@ -346,7 +346,7 @@ class IPhotoDataProviderRefreshTest : public IPhotoDataProviderTest {
|
|
|
| std::string another_album;
|
|
|
| - virtual std::string GetLibraryString() OVERRIDE {
|
| + virtual std::string GetLibraryString() override {
|
| return "<plist><dict>\n"
|
| "<key>List of Albums</key>\n"
|
| "<array>"
|
| @@ -381,7 +381,7 @@ class IPhotoDataProviderRefreshTest : public IPhotoDataProviderTest {
|
| "</dict></plist>\n";
|
| }
|
|
|
| - virtual void StartTest(bool parse_success) OVERRIDE {
|
| + virtual void StartTest(bool parse_success) override {
|
| EXPECT_TRUE(parse_success);
|
|
|
| EXPECT_EQ(FilePath("/vol/path1.jpg"),
|
| @@ -443,7 +443,7 @@ class IPhotoDataProviderInvalidTest : public IPhotoDataProviderTest {
|
| IPhotoDataProviderInvalidTest() {}
|
| virtual ~IPhotoDataProviderInvalidTest() {}
|
|
|
| - virtual void StartTest(bool parse_success) OVERRIDE {
|
| + virtual void StartTest(bool parse_success) override {
|
| EXPECT_TRUE(parse_success);
|
|
|
| SetLibraryChangeCallback(
|
|
|