Remove call to IsRunningSequenceOnCurrentThread() in media_file_system_backend.cc

chrome/browser/media_galleries/fileapi/picasa_data_provider.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 <utility>
 
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 23 matching lines @@
   }
   ready_callbacks->clear();
 }
 
 }  // namespace
 
 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),
       base::Bind(&PicasaDataProvider::OnTempDirWatchStarted,
                  weak_factory_.GetWeakPtr()),
       base::Bind(&PicasaDataProvider::OnTempDirChanged,
                  weak_factory_.GetWeakPtr()));
 }
 
 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.
 
   if (state_ == INVALID_DATA_STATE) {
     ready_callback.Run(false /* success */);
     return;
   }
 
   if (needed_data == LIST_OF_ALBUMS_AND_FOLDERS_DATA) {
     if (state_ == LIST_OF_ALBUMS_AND_FOLDERS_FRESH_STATE ||
         state_ == ALBUMS_IMAGES_FRESH_STATE) {
       ready_callback.Run(true /* success */);
       return;
     }
     album_list_ready_callbacks_.push_back(ready_callback);
   } else {
     if (state_ == ALBUMS_IMAGES_FRESH_STATE) {
       ready_callback.Run(true /* success */);
       return;
     }
     albums_index_ready_callbacks_.push_back(ready_callback);
   }
   DoRefreshIfNecessary();
 }
 
 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_));
 }
 
 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);
 
   AlbumImagesMap::const_iterator it = albums_images_.find(key);
 
   if (it == albums_images_.end()) {
     *error = base::File::FILE_ERROR_NOT_FOUND;
     return std::unique_ptr<AlbumImages>();
   }
 
   *error = base::File::FILE_OK;
   return base::WrapUnique(new AlbumImages(it->second));
 }
 
 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
   // UtilityProcessHostClients to actually kill the in-flight processes.
   state_ = STALE_DATA_STATE;
   album_table_reader_ = NULL;
   albums_indexer_ = NULL;
 
   DoRefreshIfNecessary();
 }
 
 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();
 }
 
 void PicasaDataProvider::DoRefreshIfNecessary() {
   DCHECK(state_ != INVALID_DATA_STATE);
   DCHECK(state_ != ALBUMS_IMAGES_FRESH_STATE);
   DCHECK(!(album_table_reader_.get() && albums_indexer_.get()));
 
   if (album_list_ready_callbacks_.empty() &&
@@ skipping 19 matching lines @@
                                       weak_factory_.GetWeakPtr(),
                                       albums_indexer_));
   }
 }
 
 void PicasaDataProvider::OnAlbumTableReaderDone(
     scoped_refptr<SafePicasaAlbumTableReader> reader,
     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;
   album_table_reader_ = NULL;
 
   DCHECK(state_ == STALE_DATA_STATE);
 
   if (!parse_success) {
     // If we didn't get the list successfully, fail all those waiting for
     // the albums indexer also.
@@ skipping 12 matching lines @@
   RunAllCallbacks(&album_list_ready_callbacks_, parse_success);
 
   // Chain from this process onto refreshing the albums images if necessary.
   DoRefreshIfNecessary();
 }
 
 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;
   albums_indexer_ = NULL;
 
   DCHECK(state_ == LIST_OF_ALBUMS_AND_FOLDERS_FRESH_STATE);
 
   if (success) {
     state_ = ALBUMS_IMAGES_FRESH_STATE;
 
@@ skipping 37 matching lines @@
     if (total_counts[name] != 1) {
       name = base::StringPrintf("%s (%d)", name.c_str(),
                                 ++current_counts[name]);
     }
 
     result_map->insert(std::pair<std::string, AlbumInfo>(name, info_list[i]));
   }
 }
 
 }  // namespace picasa