diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-06-19 11:58:07 +0100 |
| commit | 7d4cd473f85ac64c3747c96c277f9e506a0d2246 (patch) | |
| tree | f5fecd524f5ac22cd38bcc6713b81f666730d5a1 /android_webview/browser/net/android_stream_reader_url_request_job.cc | |
| parent | 84f2b2352908c30e40ae12ffe850dd8470f6c048 (diff) | |
| download | chromium_org-7d4cd473f85ac64c3747c96c277f9e506a0d2246.tar.gz | |
Merge from Chromium at DEPS revision r207203
This commit was generated by merge_to_master.py.
Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
Diffstat (limited to 'android_webview/browser/net/android_stream_reader_url_request_job.cc')
| -rw-r--r-- | android_webview/browser/net/android_stream_reader_url_request_job.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc index ae586b8b82..0dc659682f 100644 --- a/android_webview/browser/net/android_stream_reader_url_request_job.cc +++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc @@ -181,7 +181,7 @@ void AndroidStreamReaderURLRequestJob::OnInputStreamOpened( CreateStreamReader(input_stream.get())); DCHECK(input_stream_reader); - DCHECK(!input_stream_reader_wrapper_); + DCHECK(!input_stream_reader_wrapper_.get()); input_stream_reader_wrapper_ = new InputStreamReaderWrapper( input_stream.Pass(), input_stream_reader.Pass()); @@ -236,7 +236,7 @@ bool AndroidStreamReaderURLRequestJob::ReadRawData(net::IOBuffer* dest, int dest_size, int* bytes_read) { DCHECK(thread_checker_.CalledOnValidThread()); - if (!input_stream_reader_wrapper_) { + if (!input_stream_reader_wrapper_.get()) { // This will happen if opening the InputStream fails in which case the // error is communicated by setting the HTTP response status header rather // than failing the request during the header fetch phase. @@ -265,7 +265,7 @@ bool AndroidStreamReaderURLRequestJob::GetMimeType( JNIEnv* env = AttachCurrentThread(); DCHECK(env); - if (!input_stream_reader_wrapper_) + if (!input_stream_reader_wrapper_.get()) return false; // Since it's possible for this call to alter the InputStream a @@ -281,7 +281,7 @@ bool AndroidStreamReaderURLRequestJob::GetCharset(std::string* charset) { JNIEnv* env = AttachCurrentThread(); DCHECK(env); - if (!input_stream_reader_wrapper_) + if (!input_stream_reader_wrapper_.get()) return false; // Since it's possible for this call to alter the InputStream a |