[AW] Create AwWebResourceRequest directly from network::ResourceRequest

Add a constructor to AwWebResourceRequest to make it possible to create
AwWebResourceRequests directly from network::ResourceRequest. Also use
this constructor in the new code path related to Network Service.

This reduces duplicate code and increases readability in current and
future code. Also because of the recent introduction of
is_renderer_initiated member which is not included in any existing
constructor, this patch simplifies the actual creation of requests.

BUG=897149,841556

Change-Id: I91c3337fe9d9c3cb2b12f36e53b888bbeebb0d30
Reviewed-on: https://chromium-review.googlesource.com/c/1312484
Commit-Queue: Tim Volodine <timvolodine@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: Richard Coles <torne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606477}

android_webview/browser/aw_proxying_url_loader_factory.cc

@@ -206,14 +206,9 @@ void InterceptedRequest::OnReceiveResponse(
 
     base::PostTaskWithTraits(
         FROM_HERE, {content::BrowserThread::UI},
-        base::BindOnce(
-            &OnReceivedHttpErrorOnUiThread, process_id_,
-            request_.render_frame_id,
-            AwWebResourceRequest(
-                request_.url.spec(), request_.method,
-                request_.resource_type == content::RESOURCE_TYPE_MAIN_FRAME,
-                request_.has_user_gesture, request_.headers),
-            std::move(error_info)));
+        base::BindOnce(&OnReceivedHttpErrorOnUiThread, process_id_,
+                       request_.render_frame_id, AwWebResourceRequest(request_),
+                       std::move(error_info)));
   }
 
   if (request_.resource_type == content::RESOURCE_TYPE_MAIN_FRAME) {
@@ -332,20 +327,11 @@ void InterceptedRequest::OnRequestError(
 }
 
 void InterceptedRequest::OnReceivedErrorToCallback(int error_code) {
-  // TODO(timvolodine): add constructor for direct creation from
-  // network::ResourceRequest.
-  AwWebResourceRequest aw_request(
-      request_.url.spec(), request_.method,
-      request_.resource_type == content::RESOURCE_TYPE_MAIN_FRAME,
-      request_.has_user_gesture, request_.headers);
-  // Error callback now requires for |is_renderer_intiated| to be set.
-  aw_request.is_renderer_initiated = ui::PageTransitionIsWebTriggerable(
-      static_cast<ui::PageTransition>(request_.transition_type));
-
-  base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
-                           base::BindOnce(&OnReceivedErrorOnUiThread,
-                                          process_id_, request_.render_frame_id,
-                                          std::move(aw_request), error_code));
+  base::PostTaskWithTraits(
+      FROM_HERE, {content::BrowserThread::UI},
+      base::BindOnce(&OnReceivedErrorOnUiThread, process_id_,
+                     request_.render_frame_id, AwWebResourceRequest(request_),
+                     error_code));
 }
 
 }  // namespace

android_webview/browser/net/aw_web_resource_request.cc

@@ -8,6 +8,7 @@
 #include "net/http/http_request_headers.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
+#include "services/network/public/cpp/resource_request.h"
 #include "ui/base/page_transition_types.h"
 
 using base::android::ConvertJavaStringToUTF16;
@@ -49,6 +50,18 @@ AwWebResourceRequest::AwWebResourceRequest(const net::URLRequest& request)
   ConvertRequestHeadersToVectors(headers, &header_names, &header_values);
 }
 
+AwWebResourceRequest::AwWebResourceRequest(
+    const network::ResourceRequest& request)
+    : url(request.url.spec()),
+      method(request.method),
+      is_main_frame(request.resource_type == content::RESOURCE_TYPE_MAIN_FRAME),
+      has_user_gesture(request.has_user_gesture),
+      is_renderer_initiated(ui::PageTransitionIsWebTriggerable(
+          static_cast<ui::PageTransition>(request.transition_type))) {
+  ConvertRequestHeadersToVectors(request.headers, &header_names,
+                                 &header_values);
+}
+
 AwWebResourceRequest::AwWebResourceRequest(
     const std::string& in_url,
     const std::string& in_method,

android_webview/browser/net/aw_web_resource_request.h

@@ -17,6 +17,10 @@ class HttpRequestHeaders;
 class URLRequest;
 }
 
+namespace network {
+struct ResourceRequest;
+}
+
 namespace android_webview {
 
 // A passive data structure only used to carry request information. This
@@ -25,6 +29,7 @@ namespace android_webview {
 // https://developer.android.com/reference/android/webkit/WebResourceRequest.html
 struct AwWebResourceRequest final {
   explicit AwWebResourceRequest(const net::URLRequest& request);
+  explicit AwWebResourceRequest(const network::ResourceRequest& request);
   AwWebResourceRequest(const std::string& in_url,
                        const std::string& in_method,
                        bool in_is_main_frame,