replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]*

chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
@@ skipping 119 matching lines @@
       ASSERT_TRUE(
           base::Move(src_path, database_path_.Append(src_path.BaseName())));
     }
   }
 
   void SetInvalidateCallback(const base::Closure& callback) {
     DCHECK(invalidate_callback_.is_null());
     invalidate_callback_ = callback;
   }
 
-  virtual void InvalidateData() OVERRIDE {
+  virtual void InvalidateData() override {
     PicasaDataProvider::InvalidateData();
 
     if (!invalidate_callback_.is_null()) {
       invalidate_callback_.Run();
       invalidate_callback_.Reset();
     }
   }
 
   void SetAlbumMapsForTesting(const AlbumMap& album_map,
                               const AlbumMap& folder_map) {
     album_map_ = album_map;
     folder_map_ = folder_map;
   }
 
  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;
     for (std::vector<ReadyCallback>::const_iterator it =
              file_watch_started_callbacks_.begin();
          it != file_watch_started_callbacks_.end();
          ++it) {
       it->Run(temp_dir_watcher_.get() != NULL);
     }
     file_watch_started_callbacks_.clear();
@@ skipping 104 matching lines @@
 
   scoped_ptr<TestPicasaDataProvider> picasa_data_provider_;
 
   base::Closure quit_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(PicasaDataProviderTest);
 };
 
 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();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetListTest,
                        NoDatabaseGetList) {
   RunTest();
 }
 
 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();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PicasaDataProviderNoDatabaseGetAlbumsImagesTest,
                        NoDatabaseGetAlbumsImages) {
   RunTest();
 }
 
 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());
     TestDone();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PicasaDataProviderGetListTest, GetListTest) {
   RunTest();
 }
 
 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());
     VerifyTestAlbumsImagesIndex(
         data_provider(), test_folder_1_path(), test_folder_2_path());
     TestDone();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PicasaDataProviderGetAlbumsImagesTest,
                        GetAlbumsImagesTest) {
   RunTest();
 }
 
 class PicasaDataProviderMultipleMixedCallbacksTest
     : public PicasaDataProviderTest {
  public:
   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;
   }
 
  protected:
   virtual void ListCallback(int expected_list_callbacks_called,
                             bool parse_success) {
     ASSERT_TRUE(parse_success);
     ASSERT_EQ(expected_list_callbacks_called, ++list_callbacks_called_);
     VerifyTestAlbumTable(
         data_provider(), test_folder_1_path(), test_folder_2_path());
@@ skipping 11 matching lines @@
   }
 
  private:
   void CheckTestDone() {
     ASSERT_LE(list_callbacks_called_, 2);
     ASSERT_LE(albums_images_callbacks_called_, 2);
     if (list_callbacks_called_ == 2 && albums_images_callbacks_called_ == 2)
       TestDone();
   }
 
-  virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+  virtual void StartTestOnMediaTaskRunner() override {
     DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
 
     data_provider()->RefreshData(
         PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA,
         base::Bind(&PicasaDataProviderMultipleMixedCallbacksTest::ListCallback,
                    base::Unretained(this),
                    1));
     data_provider()->RefreshData(
         PicasaDataProvider::ALBUMS_IMAGES_DATA,
         base::Bind(
@@ skipping 41 matching lines @@
         &PicasaDataProvider::RefreshData,
         base::Unretained(data_provider()),
         RequestedDataType(),
         base::Bind(
             &PicasaDataProviderFileWatcherInvalidateTest::VerifyRefreshResults,
             base::Unretained(this))));
 
     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.
     data_provider()->RefreshData(
         RequestedDataType(),
         base::Bind(
             &PicasaDataProviderFileWatcherInvalidateTest::ListCallback,
             base::Unretained(this)));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PicasaDataProviderFileWatcherInvalidateTest,
                        FileWatcherInvalidateTest) {
   RunTest();
 }
 
 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.
     // This is guaranteed to fail to read the album table.
     data_provider()->RefreshData(
         RequestedDataType(),
         base::Bind(&PicasaDataProviderInvalidateInflightTableReaderTest::
                        VerifyRefreshResults,
                    base::Unretained(this)));
 
@@ skipping 25 matching lines @@
                        VerifyRefreshResults,
                    base::Unretained(this)));
 
     // Now invalidate all the data. The album maps will be re-read.
     data_provider()->InvalidateData();
 
     // VerifyRefreshResults callback should receive correct results now.
   }
 
  private:
-  virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+  virtual void StartTestOnMediaTaskRunner() override {
     DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
 
     data_provider()->RefreshData(
         PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA,
         base::Bind(&PicasaDataProviderInvalidateInflightAlbumsIndexerTest::
                        ListCallback,
                    base::Unretained(this)));
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PicasaDataProviderInvalidateInflightAlbumsIndexerTest,
                        InvalidateInflightAlbumsIndexerTest) {
   RunTest();
 }
 
 }  // namespace picasa