Remove call to IsRunningSequenceOnCurrentThread() in media_file_system_backend.cc

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 "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 103 matching lines @@
     if (!file_watch_request_returned_) {
       file_watch_started_callbacks_.push_back(ready_callback);
       return;
     }
     ready_callback.Run(temp_dir_watcher_.get() != NULL);
   }
 
   // Simulates the actual writing process of moving all the database files
   // from the temporary directory to the database directory in a loop.
   void MoveTempFilesToDatabase() {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
     base::FileEnumerator file_enumerator(
         database_path_.DirName().AppendASCII(kPicasaTempDirName),
         false /* recursive */,
         base::FileEnumerator::FILES);
 
     for (base::FilePath src_path = file_enumerator.Next(); !src_path.empty();
          src_path = file_enumerator.Next()) {
       ASSERT_TRUE(
           base::Move(src_path, database_path_.Append(src_path.BaseName())));
@@ skipping 67 matching lines @@
         FROM_HERE,
         base::Bind(&PicasaDataProviderTest::StartTestOnMediaTaskRunner,
                    base::Unretained(this)));
     loop.Run();
   }
 
   virtual PicasaDataProvider::DataType RequestedDataType() const = 0;
 
   // Start the test. The data provider is refreshed before calling StartTest
   // and the result of the refresh is passed in.
-  virtual void VerifyRefreshResults(bool parse_success) {};
+  virtual void VerifyRefreshResults(bool parse_success) {}
 
   void TestDone() {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
     // The data provider must be destructed on the MediaTaskRunner. This is done
     // in a posted task rather than directly because TestDone is called by
     // PicasaDataProvider. The callee should not destroy the caller.
     MediaFileSystemBackend::MediaTaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(&PicasaDataProviderTest::DestructDataProviderThenQuit,
                    base::Unretained(this)));
   }
 
   const base::FilePath& test_folder_1_path() { return test_folder_1_.path(); }
   const base::FilePath& test_folder_2_path() { return test_folder_2_.path(); }
 
   TestPicasaDataProvider* data_provider() const {
     return picasa_data_provider_.get();
   }
 
   const base::FilePath GetTempDirPath() const {
     return picasa_root_dir_.path().AppendASCII(kPicasaTempDirName);
   }
 
   virtual base::FilePath GetColumnFileDestination() const {
     return picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName);
   }
 
  private:
   void SetupFoldersAndDataProvider() {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
     ASSERT_TRUE(test_folder_1_.CreateUniqueTempDir());
     ASSERT_TRUE(test_folder_2_.CreateUniqueTempDir());
     ASSERT_TRUE(picasa_root_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(base::CreateDirectory(
         picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName)));
     ASSERT_TRUE(base::CreateDirectory(
         picasa_root_dir_.path().AppendASCII(kPicasaTempDirName)));
 
     picasa_data_provider_.reset(new TestPicasaDataProvider(
         picasa_root_dir_.path().AppendASCII(kPicasaDatabaseDirName)));
   }
 
   virtual void StartTestOnMediaTaskRunner() {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
     data_provider()->RefreshData(
         RequestedDataType(),
         base::Bind(&PicasaDataProviderTest::VerifyRefreshResults,
                    base::Unretained(this)));
   }
 
   void DestructDataProviderThenQuit() {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
     picasa_data_provider_.reset();
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE, quit_closure_);
   }
 
   base::ScopedTempDir test_folder_1_;
   base::ScopedTempDir test_folder_2_;
   base::ScopedTempDir picasa_root_dir_;
 
   std::unique_ptr<TestPicasaDataProvider> picasa_data_provider_;
@@ skipping 124 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();
   }
 
   void StartTestOnMediaTaskRunner() override {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
     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(
             &PicasaDataProviderMultipleMixedCallbacksTest::AlbumsImagesCallback,
@@ skipping 46 matching lines @@
 
     data_provider()->MoveTempFilesToDatabase();
   }
 
   base::FilePath GetColumnFileDestination() const override {
     return GetTempDirPath();
   }
 
  private:
   void StartTestOnMediaTaskRunner() override {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
     // 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.
   void InitializeTestData() override {}
 
  private:
   void StartTestOnMediaTaskRunner() override {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
     // 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)));
 
     // Now write the album table and invalidate the inflight table reader.
@@ skipping 25 matching lines @@
                    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:
   void StartTestOnMediaTaskRunner() override {
-    DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+    MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
     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