Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media_galleries / fileapi / picasa_data_provider_browsertest.cc

diff --git a/src/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc b/src/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc
index 061aa6d..e4a47f0 100644 (file)
--- a/src/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc
+++ b/src/chrome/browser/media_galleries/fileapi/picasa_data_provider_browsertest.cc
@@ -4,8 +4,8 @@
 
 #include <vector>
 
-#include "base/file_util.h"
 #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"
 #include "base/memory/scoped_ptr.h"
@@ -103,7 +103,7 @@ class TestPicasaDataProvider : public PicasaDataProvider {
         file_watch_request_returned_(false)  {
   }
 
-  virtual ~TestPicasaDataProvider() {}
+  ~TestPicasaDataProvider() override {}
 
   // |ready_callback| called with true if and when the file watch is started
   // successfully. If the file watch fails, it's called with false.
@@ -137,7 +137,7 @@ class TestPicasaDataProvider : public PicasaDataProvider {
     invalidate_callback_ = callback;
   }
 
-  virtual void InvalidateData() OVERRIDE {
+  void InvalidateData() override {
     PicasaDataProvider::InvalidateData();
 
     if (!invalidate_callback_.is_null()) {
@@ -153,8 +153,8 @@ class TestPicasaDataProvider : public PicasaDataProvider {
   }
 
  private:
-  virtual void OnTempDirWatchStarted(
-      scoped_ptr<base::FilePathWatcher> temp_dir_watcher) OVERRIDE {
+  void OnTempDirWatchStarted(
+      scoped_ptr<base::FilePathWatcher> temp_dir_watcher) override {
     PicasaDataProvider::OnTempDirWatchStarted(temp_dir_watcher.Pass());
 
     file_watch_request_returned_ = true;
@@ -184,7 +184,7 @@ class PicasaDataProviderTest : public InProcessBrowserTest {
   virtual void InitializeTestData() {}
 
   void RunTest() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     base::RunLoop loop;
     quit_closure_ = loop.QuitClosure();
     MediaFileSystemBackend::MediaTaskRunner()->PostTask(
@@ -279,10 +279,10 @@ class PicasaDataProviderTest : public InProcessBrowserTest {
 
 class PicasaDataProviderNoDatabaseGetListTest : public PicasaDataProviderTest {
  protected:
-  virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE {
+  PicasaDataProvider::DataType RequestedDataType() const override {
     return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA;
   }
-  virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+  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 {
+  PicasaDataProvider::DataType RequestedDataType() const override {
     return PicasaDataProvider::ALBUMS_IMAGES_DATA;
   }
-  virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+  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 {
+  void InitializeTestData() override {
     WriteTestAlbumTable(GetColumnFileDestination(), test_folder_1_path(),
                         test_folder_2_path());
   }
 
-  virtual PicasaDataProvider::DataType RequestedDataType() const OVERRIDE {
+  PicasaDataProvider::DataType RequestedDataType() const override {
     return PicasaDataProvider::LIST_OF_ALBUMS_AND_FOLDERS_DATA;
   }
 
-  virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+  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 {
+  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 {
+  PicasaDataProvider::DataType RequestedDataType() const override {
     return PicasaDataProvider::ALBUMS_IMAGES_DATA;
   }
 
-  virtual void VerifyRefreshResults(bool parse_success) OVERRIDE {
+  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 {
+  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 {
+  PicasaDataProvider::DataType RequestedDataType() const override {
     return PicasaDataProvider::ALBUMS_IMAGES_DATA;
   }
 
@@ -404,7 +404,7 @@ class PicasaDataProviderMultipleMixedCallbacksTest
       TestDone();
   }
 
-  virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+  void StartTestOnMediaTaskRunner() override {
     DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
 
     data_provider()->RefreshData(
@@ -466,12 +466,12 @@ class PicasaDataProviderFileWatcherInvalidateTest
     data_provider()->MoveTempFilesToDatabase();
   }
 
-  virtual base::FilePath GetColumnFileDestination() const OVERRIDE {
+  base::FilePath GetColumnFileDestination() const override {
     return GetTempDirPath();
   }
 
  private:
-  virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+  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 {}
+  void InitializeTestData() override {}
 
  private:
-  virtual void StartTestOnMediaTaskRunner() OVERRIDE {
+  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 {
+  void StartTestOnMediaTaskRunner() override {
     DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
 
     data_provider()->RefreshData(