chrome/browser/chromeos/drive/drive_file_stream_reader.cc - Issue 16998003: Update CrOS to use scoped_refptr<T>::get() rather than implicit "operator T*"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/drive/drive_file_stream_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

« no previous file with comments | « chrome/browser/chromeos/drive/change_list_processor_unittest.cc ('k') | chrome/browser/chromeos/drive/drive_integration_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/drive/drive_file_stream_reader.cc

diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc

index 3d6a7e24db8c67a9e09aca348754c942887f4da9..71170857c2b23863e8594ab732ee7b8eb98b0137 100644

--- a/chrome/browser/chromeos/drive/drive_file_stream_reader.cc

+++ b/chrome/browser/chromeos/drive/drive_file_stream_reader.cc

@@ -143,7 +143,7 @@ int NetworkReaderProxy::Read(net::IOBuffer* buffer, int buffer_length,

const net::CompletionCallback& callback) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));

// Check if there is no pending Read operation.

- DCHECK(!buffer_);

+ DCHECK(!buffer_.get());

DCHECK_EQ(buffer_length_, 0);

DCHECK(callback_.is_null());

// Validate the arguments.

@@ -197,7 +197,7 @@ void NetworkReaderProxy::OnGetContent(scoped_ptr<std::string> data) {

}

pending_data_.push_back(data.release());

- if (!buffer_) {

+ if (!buffer_.get()) {

// No pending Read operation.

return;

}

@@ -380,7 +380,7 @@ void DriveFileStreamReader::InitializeAfterGetFileContentByPathInitialized(

// Otherwise, open the stream for file.

scoped_ptr<util::LocalFileReader> file_reader(

- new util::LocalFileReader(file_task_runner_));

+ new util::LocalFileReader(file_task_runner_.get()));

util::LocalFileReader* file_reader_ptr = file_reader.get();

file_reader_ptr->Open(

local_cache_file_path,