Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6236)

Unified Diff: chrome/browser/media_galleries/fileapi/picasa_data_provider.cc

Issue 591493002: Remove implicit conversions from scoped_refptr to T* in chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatting Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8d37d889ae9b5ce82b1e87870d7235c02f59cf69..3cd347cf5dcc98443b2ec3c823245cd5fc835293 100644
--- a/chrome/browser/media_galleries/fileapi/picasa_data_provider.cc
+++ b/chrome/browser/media_galleries/fileapi/picasa_data_provider.cc
@@ -142,7 +142,7 @@ void PicasaDataProvider::OnTempDirChanged(const base::FilePath& temp_dir_path,
void PicasaDataProvider::DoRefreshIfNecessary() {
DCHECK(state_ != INVALID_DATA_STATE);
DCHECK(state_ != ALBUMS_IMAGES_FRESH_STATE);
- DCHECK(!(album_table_reader_ && albums_indexer_));
+ DCHECK(!(album_table_reader_.get() && albums_indexer_.get()));
if (album_list_ready_callbacks_.empty() &&
albums_index_ready_callbacks_.empty()) {
@@ -150,7 +150,7 @@ void PicasaDataProvider::DoRefreshIfNecessary() {
}
if (state_ == STALE_DATA_STATE) {
- if (album_table_reader_)
+ if (album_table_reader_.get())
return;
album_table_reader_ =
new SafePicasaAlbumTableReader(AlbumTableFiles(database_path_));
@@ -160,7 +160,7 @@ void PicasaDataProvider::DoRefreshIfNecessary() {
album_table_reader_));
} else {
DCHECK(state_ == LIST_OF_ALBUMS_AND_FOLDERS_FRESH_STATE);
- if (albums_indexer_)
+ if (albums_indexer_.get())
return;
albums_indexer_ = new SafePicasaAlbumsIndexer(album_map_, folder_map_);
albums_indexer_->Start(base::Bind(&PicasaDataProvider::OnAlbumsIndexerDone,
@@ -176,7 +176,7 @@ void PicasaDataProvider::OnAlbumTableReaderDone(
const std::vector<AlbumInfo>& folders) {
DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
// If the reader has already been deemed stale, ignore the result.
- if (reader != album_table_reader_)
+ if (reader.get() != album_table_reader_.get())
return;
album_table_reader_ = NULL;
@@ -209,7 +209,7 @@ void PicasaDataProvider::OnAlbumsIndexerDone(
const picasa::AlbumImagesMap& albums_images) {
DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
// If the indexer has already been deemed stale, ignore the result.
- if (indexer != albums_indexer_)
+ if (indexer.get() != albums_indexer_.get())
return;
albums_indexer_ = NULL;

Powered by Google App Engine
This is Rietveld 408576698