[Android WebView] Call shouldInterceptRequest on a background thread

android_webview/browser/net/android_stream_reader_url_request_job.h

 // 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.
 
-#ifndef ANDROID_WEBVIEW_NATIVE_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
-#define ANDROID_WEBVIEW_NATIVE_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
+#ifndef ANDROID_WEBVIEW_BROWSER_NET_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
+#define ANDROID_WEBVIEW_BROWSER_NET_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
 
 #include <string>
 
 #include "base/android/scoped_java_ref.h"
+#include "base/callback_forward.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_job.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace net {
 class HttpResponseHeaders;
 class HttpResponseInfo;
 class URLRequest;
 }
 
 namespace android_webview {
 
+class AwWebResourceResponse;
 class InputStream;
 class InputStreamReader;
 class InputStreamReaderWrapper;
 
 // A request job that reads data from a Java InputStream.
 class AndroidStreamReaderURLRequestJob : public net::URLRequestJob {
  public:
   /*
    * We use a delegate so that we can share code for this job in slightly
    * different contexts.
@@ skipping 26 matching lines @@
         std::string* charset) = 0;
 
     virtual void AppendResponseHeaders(JNIEnv* env,
                                        net::HttpResponseHeaders* headers) = 0;
 
     virtual ~Delegate() {}
   };
 
   AndroidStreamReaderURLRequestJob(
       net::URLRequest* request,
+      net::NetworkDelegate* network_delegate);
+  AndroidStreamReaderURLRequestJob(
+      net::URLRequest* request,
       net::NetworkDelegate* network_delegate,
       scoped_ptr<Delegate> delegate);

[mmenke, 2015/09/30 21:13:34]

nit:  Should probably have a blank line after constructors.

[mnaganov (inactive), 2015/10/01 18:04:30]

Done.

+  base::Callback<void(scoped_ptr<AwWebResourceResponse>)>
+  GetWebResourceResponseCallback();

[mmenke, 2015/09/30 21:13:34]

need to include callback.h for this.

[mnaganov (inactive), 2015/10/01 18:04:30]

Done.

 
   // URLRequestJob:
   void Start() override;
   void Kill() override;
   bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read) override;
   void SetExtraRequestHeaders(const net::HttpRequestHeaders& headers) override;
   bool GetMimeType(std::string* mime_type) const override;
   bool GetCharset(std::string* charset) override;
   int GetResponseCode() const override;
   void GetResponseInfo(net::HttpResponseInfo* info) override;
 
  protected:
   ~AndroidStreamReaderURLRequestJob() override;
 
   // Gets the TaskRunner for the worker thread.
   // Overridden in unittests.
   virtual base::TaskRunner* GetWorkerThreadRunner();
 
   // Creates an InputStreamReader instance.
   // Overridden in unittests to return a mock.
   virtual scoped_ptr<android_webview::InputStreamReader>
       CreateStreamReader(android_webview::InputStream* stream);
 
  private:
+  void WebResourceResponseObtained(scoped_ptr<AwWebResourceResponse> response);
+  void MaybeStart();

[mmenke, 2015/09/30 21:13:34]

Should provide some documentation of these.

[mnaganov (inactive), 2015/10/01 18:04:30]

OK, I have changed them a bit according to your proposal, but I've added docs
for the new methods.

+
   void HeadersComplete(int status_code, const std::string& status_text);
 
   void OnInputStreamOpened(
       scoped_ptr<Delegate> delegate,
       scoped_ptr<android_webview::InputStream> input_stream);
   void OnReaderSeekCompleted(int content_size);
   void OnReaderReadCompleted(int bytes_read);
 
+  bool has_been_started() { return has_been_started_; }

[mmenke, 2015/09/30 21:13:34]

Private accessor seems a little weird...can just access the variable directly. 
If you prefer to keep it, it should be const.

[mnaganov (inactive), 2015/10/01 18:04:30]

Got rid of it.

+
   net::HttpByteRange byte_range_;
   scoped_ptr<net::HttpResponseInfo> response_info_;
   scoped_ptr<Delegate> delegate_;
   scoped_refptr<InputStreamReaderWrapper> input_stream_reader_wrapper_;
   base::ThreadChecker thread_checker_;
+  bool has_been_started_;
 
   base::WeakPtrFactory<AndroidStreamReaderURLRequestJob> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidStreamReaderURLRequestJob);

[mmenke, 2015/09/30 21:13:34]

While you're here, should include base/macros.g for DISALLOW_COPY_AND_ASSIGN.

[mnaganov (inactive), 2015/10/01 18:04:30]

Done.

 };
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_NATIVE_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_
+#endif  // ANDROID_WEBVIEW_BROWSER_NET_ANDROID_STREAM_READER_URL_REQUEST_JOB_H_