Make URLRequestJob::SetStatus private.

android_webview/browser/net/android_stream_reader_url_request_job.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 
 #include <string>
 #include <utility>
 
 #include "android_webview/browser/input_stream.h"
@@ skipping 156 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(returned_delegate);
   delegate_ = std::move(returned_delegate);
 
   if (!input_stream) {
     bool restart_required = false;
     delegate_->OnInputStreamOpenFailed(request(), &restart_required);
     if (restart_required) {
       NotifyRestartRequired();
     } else {
-      // Clear the IO_PENDING status set in Start().
-      SetStatus(net::URLRequestStatus());
       HeadersComplete(kHTTPNotFound, kHTTPNotFoundText);
     }
     return;
   }
 
   scoped_ptr<InputStreamReader> input_stream_reader(
       CreateStreamReader(input_stream.get()));
   DCHECK(input_stream_reader);
 
   DCHECK(!input_stream_reader_wrapper_.get());
   input_stream_reader_wrapper_ = new InputStreamReaderWrapper(
       std::move(input_stream), std::move(input_stream_reader));
 
   PostTaskAndReplyWithResult(
       GetWorkerThreadRunner(),
       FROM_HERE,
       base::Bind(&InputStreamReaderWrapper::Seek,
                  input_stream_reader_wrapper_,
                  byte_range_),
       base::Bind(&AndroidStreamReaderURLRequestJob::OnReaderSeekCompleted,
                  weak_factory_.GetWeakPtr()));
 }
 
 void AndroidStreamReaderURLRequestJob::OnReaderSeekCompleted(int result) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  // Clear the IO_PENDING status set in Start().
-  SetStatus(net::URLRequestStatus());
   if (result >= 0) {
     set_expected_content_size(result);
     HeadersComplete(kHTTPOk, kHTTPOkText);
   } else {
     NotifyStartError(
         net::URLRequestStatus(net::URLRequestStatus::FAILED, result));
   }
 }
 
 void AndroidStreamReaderURLRequestJob::OnReaderReadCompleted(int result) {
@@ skipping 29 matching lines @@
 
 bool AndroidStreamReaderURLRequestJob::GetMimeType(
     std::string* mime_type) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
   if (!input_stream_reader_wrapper_.get())
     return false;
 
-  // Since it's possible for this call to alter the InputStream a
-  // Seek or ReadRawData operation running in the background is not permitted.
-  DCHECK(!request_->status().is_io_pending());
-
   return delegate_->GetMimeType(

[mmenke, 2016/01/15 18:31:05]

request_->status() is now managed by net, so it hasn't been updated in the call
to this method from HeadersComplete(), below.  Happy to add some other DCHECK
instead, if you want.

[mnaganov (inactive), 2016/01/15 19:04:58]

I think it should be fine, thanks for letting us know!

       env, request(), input_stream_reader_wrapper_->input_stream(), mime_type);
 }
 
 bool AndroidStreamReaderURLRequestJob::GetCharset(std::string* charset) {
   DCHECK(thread_checker_.CalledOnValidThread());
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
 
   if (!input_stream_reader_wrapper_.get())
     return false;
@@ skipping 18 matching lines @@
   }
 }
 
 void AndroidStreamReaderURLRequestJob::DoStart() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (range_parse_result_ != net::OK) {
     NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
                                            range_parse_result_));
     return;
   }
-  // Start reading asynchronously so that all error reporting and data
-  // callbacks happen as they would for network requests.
-  SetStatus(net::URLRequestStatus(net::URLRequestStatus::IO_PENDING,
-                                  net::ERR_IO_PENDING));
 
   // This could be done in the InputStreamReader but would force more
   // complex synchronization in the delegate.
   GetWorkerThreadRunner()->PostTask(
       FROM_HERE,
       base::Bind(
           &OpenInputStreamOnWorkerThread,
           base::MessageLoop::current()->task_runner(),
           // This is intentional - the job could be deleted while the callback
           // is executing on the background thread.
@@ skipping 73 matching lines @@
         byte_range_ = ranges[0];
     } else {
       // We don't support multiple range requests in one single URL request,
       // because we need to do multipart encoding here.
       range_parse_result_ = net::ERR_REQUEST_RANGE_NOT_SATISFIABLE;
     }
   }
 }
 
 }  // namespace android_webview