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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/drive/file_cache.cc

Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/drive/drive_url_request_job.cc ('k') | chrome/browser/chromeos/drive/file_cache_metadata.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/file_cache.cc
diff --git a/chrome/browser/chromeos/drive/file_cache.cc b/chrome/browser/chromeos/drive/file_cache.cc
index 36e09b99eba08eb26119c3256f52f8702c598003..e48071216c3ac11cf58342994fc3e2803b38389a 100644
--- a/chrome/browser/chromeos/drive/file_cache.cc
+++ b/chrome/browser/chromeos/drive/file_cache.cc
@@ -288,7 +288,7 @@ FileCache::FileCache(const base::FilePath& cache_root_path,
blocking_task_runner_(blocking_task_runner),
free_disk_space_getter_(free_disk_space_getter),
weak_ptr_factory_(this) {
- DCHECK(blocking_task_runner_);
+ DCHECK(blocking_task_runner_.get());
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
}
@@ -336,7 +336,7 @@ base::FilePath FileCache::GetCacheFilePath(
}
void FileCache::AssertOnSequencedWorkerPool() {
- DCHECK(!blocking_task_runner_ ||
+ DCHECK(!blocking_task_runner_.get() ||
blocking_task_runner_->RunsTasksOnCurrentThread());
}
@@ -352,12 +352,15 @@ void FileCache::GetCacheEntryOnUIThread(const std::string& resource_id,
FileCacheEntry* cache_entry = new FileCacheEntry;
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&FileCache::GetCacheEntry,
- base::Unretained(this), resource_id, md5, cache_entry),
- base::Bind(&RunGetCacheEntryCallback,
- callback, base::Owned(cache_entry)));
+ base::Unretained(this),
+ resource_id,
+ md5,
+ cache_entry),
+ base::Bind(
+ &RunGetCacheEntryCallback, callback, base::Owned(cache_entry)));
}
bool FileCache::GetCacheEntry(const std::string& resource_id,
@@ -401,7 +404,7 @@ void FileCache::FreeDiskSpaceIfNeededForOnUIThread(
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&FileCache::FreeDiskSpaceIfNeededFor,
base::Unretained(this),
@@ -441,13 +444,16 @@ void FileCache::GetFileOnUIThread(const std::string& resource_id,
DCHECK(!callback.is_null());
base::FilePath* cache_file_path = new base::FilePath;
- base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
- FROM_HERE,
- base::Bind(&FileCache::GetFile,
- base::Unretained(this), resource_id, md5, cache_file_path),
- base::Bind(&RunGetFileFromCacheCallback,
- callback, base::Owned(cache_file_path)));
+ base::PostTaskAndReplyWithResult(blocking_task_runner_.get(),
+ FROM_HERE,
+ base::Bind(&FileCache::GetFile,
+ base::Unretained(this),
+ resource_id,
+ md5,
+ cache_file_path),
+ base::Bind(&RunGetFileFromCacheCallback,
+ callback,
+ base::Owned(cache_file_path)));
}
FileError FileCache::GetFile(const std::string& resource_id,
@@ -485,13 +491,15 @@ void FileCache::StoreOnUIThread(const std::string& resource_id,
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
- FROM_HERE,
- base::Bind(&FileCache::Store,
- base::Unretained(this),
- resource_id, md5, source_path, file_operation_type),
- callback);
+ base::PostTaskAndReplyWithResult(blocking_task_runner_.get(),
+ FROM_HERE,
+ base::Bind(&FileCache::Store,
+ base::Unretained(this),
+ resource_id,
+ md5,
+ source_path,
+ file_operation_type),
+ callback);
}
FileError FileCache::Store(const std::string& resource_id,
@@ -509,7 +517,7 @@ void FileCache::PinOnUIThread(const std::string& resource_id,
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&FileCache::Pin, base::Unretained(this), resource_id, md5),
callback);
@@ -566,7 +574,7 @@ void FileCache::UnpinOnUIThread(const std::string& resource_id,
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&FileCache::Unpin, base::Unretained(this), resource_id, md5),
callback);
@@ -638,12 +646,14 @@ void FileCache::MarkAsMountedOnUIThread(
base::FilePath* cache_file_path = new base::FilePath;
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&FileCache::MarkAsMounted,
- base::Unretained(this), resource_id, cache_file_path),
- base::Bind(RunGetFileFromCacheCallback,
- callback, base::Owned(cache_file_path)));
+ base::Unretained(this),
+ resource_id,
+ cache_file_path),
+ base::Bind(
+ RunGetFileFromCacheCallback, callback, base::Owned(cache_file_path)));
}
void FileCache::MarkAsUnmountedOnUIThread(
@@ -653,10 +663,10 @@ void FileCache::MarkAsUnmountedOnUIThread(
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
- base::Bind(&FileCache::MarkAsUnmounted,
- base::Unretained(this), file_path),
+ base::Bind(
+ &FileCache::MarkAsUnmounted, base::Unretained(this), file_path),
callback);
}
@@ -667,10 +677,10 @@ void FileCache::MarkDirtyOnUIThread(const std::string& resource_id,
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
- base::Bind(&FileCache::MarkDirty,
- base::Unretained(this), resource_id, md5),
+ base::Bind(
+ &FileCache::MarkDirty, base::Unretained(this), resource_id, md5),
callback);
}
@@ -791,10 +801,9 @@ void FileCache::RemoveOnUIThread(const std::string& resource_id,
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
- base::Bind(&FileCache::Remove,
- base::Unretained(this), resource_id),
+ base::Bind(&FileCache::Remove, base::Unretained(this), resource_id),
callback);
}
@@ -853,7 +862,7 @@ void FileCache::ClearAllOnUIThread(const InitializeCacheCallback& callback) {
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&FileCache::ClearAll, base::Unretained(this)),
callback);
@@ -864,7 +873,7 @@ void FileCache::RequestInitialize(const InitializeCacheCallback& callback) {
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&FileCache::InitializeOnBlockingPool, base::Unretained(this)),
callback);
@@ -890,7 +899,7 @@ bool FileCache::InitializeOnBlockingPool() {
if (!InitCachePaths(cache_paths_))
return false;
- metadata_.reset(new FileCacheMetadata(blocking_task_runner_));
+ metadata_.reset(new FileCacheMetadata(blocking_task_runner_.get()));
switch (metadata_->Initialize(cache_paths_[CACHE_TYPE_META])) {
case FileCacheMetadata::INITIALIZE_FAILED:
« no previous file with comments | « chrome/browser/chromeos/drive/drive_url_request_job.cc ('k') | chrome/browser/chromeos/drive/file_cache_metadata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698