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

Unified Diff: chrome/browser/chromeos/drive/resource_metadata.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
Index: chrome/browser/chromeos/drive/resource_metadata.cc
diff --git a/chrome/browser/chromeos/drive/resource_metadata.cc b/chrome/browser/chromeos/drive/resource_metadata.cc
index fd33c465d2d30032332411c19df27b87c164d1cf..e62d6557b8ad4187dc80211f72cd4187d7a28051 100644
--- a/chrome/browser/chromeos/drive/resource_metadata.cc
+++ b/chrome/browser/chromeos/drive/resource_metadata.cc
@@ -139,7 +139,7 @@ void ResourceMetadata::Initialize(const FileOperationCallback& callback) {
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&ResourceMetadata::InitializeOnBlockingPool,
base::Unretained(this)),
@@ -161,10 +161,9 @@ void ResourceMetadata::ResetOnUIThread(const FileOperationCallback& callback) {
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
- base::Bind(&ResourceMetadata::Reset,
- base::Unretained(this)),
+ base::Bind(&ResourceMetadata::Reset, base::Unretained(this)),
callback);
}
@@ -232,7 +231,7 @@ void ResourceMetadata::GetLargestChangestampOnUIThread(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&ResourceMetadata::GetLargestChangestamp,
base::Unretained(this)),
@@ -245,7 +244,7 @@ void ResourceMetadata::SetLargestChangestampOnUIThread(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&ResourceMetadata::SetLargestChangestamp,
base::Unretained(this),
@@ -273,11 +272,10 @@ void ResourceMetadata::AddEntryOnUIThread(const ResourceEntry& entry,
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- PostFileMoveTask(blocking_task_runner_,
- base::Bind(&AddEntryWithFilePath,
- base::Unretained(this),
- entry),
- callback);
+ PostFileMoveTask(
+ blocking_task_runner_.get(),
+ base::Bind(&AddEntryWithFilePath, base::Unretained(this), entry),
+ callback);
}
FileError ResourceMetadata::AddEntry(const ResourceEntry& entry) {
@@ -309,7 +307,7 @@ void ResourceMetadata::MoveEntryToDirectoryOnUIThread(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- PostFileMoveTask(blocking_task_runner_,
+ PostFileMoveTask(blocking_task_runner_.get(),
base::Bind(&ResourceMetadata::MoveEntryToDirectory,
base::Unretained(this),
file_path,
@@ -323,7 +321,7 @@ void ResourceMetadata::RenameEntryOnUIThread(const base::FilePath& file_path,
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- PostFileMoveTask(blocking_task_runner_,
+ PostFileMoveTask(blocking_task_runner_.get(),
base::Bind(&ResourceMetadata::RenameEntry,
base::Unretained(this),
file_path,
@@ -359,15 +357,13 @@ void ResourceMetadata::GetResourceEntryByIdOnUIThread(
scoped_ptr<ResourceEntry> entry(new ResourceEntry);
ResourceEntry* entry_ptr = entry.get();
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&ResourceMetadata::GetResourceEntryById,
base::Unretained(this),
resource_id,
entry_ptr),
- base::Bind(&RunGetResourceEntryCallback,
- callback,
- base::Passed(&entry)));
+ base::Bind(&RunGetResourceEntryCallback, callback, base::Passed(&entry)));
}
FileError ResourceMetadata::GetResourceEntryById(
@@ -394,15 +390,13 @@ void ResourceMetadata::GetResourceEntryByPathOnUIThread(
scoped_ptr<ResourceEntry> entry(new ResourceEntry);
ResourceEntry* entry_ptr = entry.get();
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&ResourceMetadata::GetResourceEntryByPath,
base::Unretained(this),
file_path,
entry_ptr),
- base::Bind(&RunGetResourceEntryCallback,
- callback,
- base::Passed(&entry)));
+ base::Bind(&RunGetResourceEntryCallback, callback, base::Passed(&entry)));
}
FileError ResourceMetadata::GetResourceEntryByPath(const base::FilePath& path,
@@ -427,15 +421,13 @@ void ResourceMetadata::ReadDirectoryByPathOnUIThread(
scoped_ptr<ResourceEntryVector> entries(new ResourceEntryVector);
ResourceEntryVector* entries_ptr = entries.get();
base::PostTaskAndReplyWithResult(
- blocking_task_runner_,
+ blocking_task_runner_.get(),
FROM_HERE,
base::Bind(&ResourceMetadata::ReadDirectoryByPath,
base::Unretained(this),
file_path,
entries_ptr),
- base::Bind(&RunReadDirectoryCallback,
- callback,
- base::Passed(&entries)));
+ base::Bind(&RunReadDirectoryCallback, callback, base::Passed(&entries)));
}
FileError ResourceMetadata::ReadDirectoryByPath(
@@ -501,7 +493,7 @@ void ResourceMetadata::RefreshDirectoryOnUIThread(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
- PostFileMoveTask(blocking_task_runner_,
+ PostFileMoveTask(blocking_task_runner_.get(),
base::Bind(&ResourceMetadata::RefreshDirectory,
base::Unretained(this),
directory_fetch_info,
« no previous file with comments | « chrome/browser/chromeos/drive/local_file_reader.cc ('k') | chrome/browser/chromeos/drive/search_metadata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698