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

Unified Diff: chrome/browser/chromeos/drive/local_file_reader.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/local_file_reader.cc
diff --git a/chrome/browser/chromeos/drive/local_file_reader.cc b/chrome/browser/chromeos/drive/local_file_reader.cc
index 08cb3822674afc42cdcd362547d62c5ad1807211..5b9b016301ece7f591bc52f367194fbf1e8ba4b9 100644
--- a/chrome/browser/chromeos/drive/local_file_reader.cc
+++ b/chrome/browser/chromeos/drive/local_file_reader.cc
@@ -117,7 +117,7 @@ LocalFileReader::LocalFileReader(
: sequenced_task_runner_(sequenced_task_runner),
platform_file_(base::kInvalidPlatformFileValue),
weak_ptr_factory_(this) {
- DCHECK(sequenced_task_runner_);
+ DCHECK(sequenced_task_runner_.get());
}
LocalFileReader::~LocalFileReader() {
@@ -131,15 +131,16 @@ void LocalFileReader::Open(const base::FilePath& file_path,
DCHECK_EQ(base::kInvalidPlatformFileValue, platform_file_);
ScopedPlatformFile* platform_file =
- new ScopedPlatformFile(sequenced_task_runner_);
+ new ScopedPlatformFile(sequenced_task_runner_.get());
base::PostTaskAndReplyWithResult(
- sequenced_task_runner_,
+ sequenced_task_runner_.get(),
FROM_HERE,
- base::Bind(&OpenAndSeekOnBlockingPool,
- file_path, offset, platform_file->ptr()),
+ base::Bind(
+ &OpenAndSeekOnBlockingPool, file_path, offset, platform_file->ptr()),
base::Bind(&LocalFileReader::OpenAfterBlockingPoolTask,
weak_ptr_factory_.GetWeakPtr(),
- callback, base::Owned(platform_file)));
+ callback,
+ base::Owned(platform_file)));
}
void LocalFileReader::Read(net::IOBuffer* in_buffer,
@@ -150,7 +151,7 @@ void LocalFileReader::Read(net::IOBuffer* in_buffer,
scoped_refptr<net::IOBuffer> buffer(in_buffer);
base::PostTaskAndReplyWithResult(
- sequenced_task_runner_,
+ sequenced_task_runner_.get(),
FROM_HERE,
base::Bind(&ReadOnBlockingPool, platform_file_, buffer, buffer_length),
callback);
« no previous file with comments | « chrome/browser/chromeos/drive/file_system_util_unittest.cc ('k') | chrome/browser/chromeos/drive/resource_metadata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698