Remove call to IsRunningSequenceOnCurrentThread() in media_file_system_backend.cc

chrome/browser/media_galleries/fileapi/picasa_data_provider.cc

Index: chrome/browser/media_galleries/fileapi/picasa_data_provider.cc
diff --git a/chrome/browser/media_galleries/fileapi/picasa_data_provider.cc b/chrome/browser/media_galleries/fileapi/picasa_data_provider.cc
index 5bca76902f6a0fcd855f2229854d06a87a5b7094..df2a1fb87066f0a94d155e833de14ed753ca3b91 100644
--- a/chrome/browser/media_galleries/fileapi/picasa_data_provider.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa_data_provider.cc
@@ -41,7 +41,7 @@ PicasaDataProvider::PicasaDataProvider(const base::FilePath& database_path)
     : database_path_(database_path),
       state_(STALE_DATA_STATE),
       weak_factory_(this) {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
   StartFilePathWatchOnMediaTaskRunner(
       database_path_.DirName().AppendASCII(kPicasaTempDirName),
@@ -55,7 +55,7 @@ PicasaDataProvider::~PicasaDataProvider() {}
 
 void PicasaDataProvider::RefreshData(DataType needed_data,
                                      const ReadyCallback& ready_callback) {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   // TODO(tommycli): Need to watch the database_path_ folder and handle
   // rereading the data when it changes.
 
@@ -82,14 +82,14 @@ void PicasaDataProvider::RefreshData(DataType needed_data,
 }
 
 std::unique_ptr<AlbumMap> PicasaDataProvider::GetFolders() {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   DCHECK(state_ == LIST_OF_ALBUMS_AND_FOLDERS_FRESH_STATE ||
          state_ == ALBUMS_IMAGES_FRESH_STATE);
   return base::WrapUnique(new AlbumMap(folder_map_));
 }
 
 std::unique_ptr<AlbumMap> PicasaDataProvider::GetAlbums() {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   DCHECK(state_ == LIST_OF_ALBUMS_AND_FOLDERS_FRESH_STATE ||
          state_ == ALBUMS_IMAGES_FRESH_STATE);
   return base::WrapUnique(new AlbumMap(album_map_));
@@ -98,7 +98,7 @@ std::unique_ptr<AlbumMap> PicasaDataProvider::GetAlbums() {
 std::unique_ptr<AlbumImages> PicasaDataProvider::FindAlbumImages(
     const std::string& key,
     base::File::Error* error) {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   DCHECK(state_ == ALBUMS_IMAGES_FRESH_STATE);
   DCHECK(error);
 
@@ -114,7 +114,7 @@ std::unique_ptr<AlbumImages> PicasaDataProvider::FindAlbumImages(
 }
 
 void PicasaDataProvider::InvalidateData() {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
 
   // Set data state to stale and ignore responses from any in-flight processes.
   // TODO(tommycli): Implement and call Cancel function for these
@@ -128,13 +128,13 @@ void PicasaDataProvider::InvalidateData() {
 
 void PicasaDataProvider::OnTempDirWatchStarted(
     std::unique_ptr<base::FilePathWatcher> temp_dir_watcher) {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   temp_dir_watcher_.reset(temp_dir_watcher.release());
 }
 
 void PicasaDataProvider::OnTempDirChanged(const base::FilePath& temp_dir_path,
                                           bool error) {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   if (base::IsDirectoryEmpty(temp_dir_path))
     InvalidateData();
 }
@@ -174,7 +174,7 @@ void PicasaDataProvider::OnAlbumTableReaderDone(
     bool parse_success,
     const std::vector<AlbumInfo>& albums,
     const std::vector<AlbumInfo>& folders) {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   // If the reader has already been deemed stale, ignore the result.
   if (reader.get() != album_table_reader_.get())
     return;
@@ -207,7 +207,7 @@ void PicasaDataProvider::OnAlbumsIndexerDone(
     scoped_refptr<SafePicasaAlbumsIndexer> indexer,
     bool success,
     const picasa::AlbumImagesMap& albums_images) {
-  DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
+  MediaFileSystemBackend::AssertCurrentlyOnMediaSequence();
   // If the indexer has already been deemed stale, ignore the result.
   if (indexer.get() != albums_indexer_.get())
     return;