Revert of Move onReceivedError and onReceivedHttpError out of AwContentsIoThreadClientImpl

android_webview/browser/net/aw_web_resource_request.h

Index: android_webview/browser/net/aw_web_resource_request.h
diff --git a/android_webview/browser/net/aw_web_resource_request.h b/android_webview/browser/net/aw_web_resource_request.h
deleted file mode 100644
index 53dca708f29f56d1e47cc2cd5aad1301c31e642e..0000000000000000000000000000000000000000
--- a/android_webview/browser/net/aw_web_resource_request.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2016 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_BROWSER_NET_AW_WEB_RESOURCE_REQUEST_H_
-#define ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_REQUEST_H_
-
-#include <string>
-#include <vector>
-
-#include "base/android/jni_array.h"
-#include "base/android/jni_string.h"
-
-namespace net {
-class URLRequest;
-}
-
-namespace android_webview {
-
-// A passive data structure only used to carry request information. This
-// class should be copyable.
-struct AwWebResourceRequest final {
-  explicit AwWebResourceRequest(const net::URLRequest& request);
-
-  // Add default copy/move/assign operators. Adding explicit destructor
-  // prevents generating move operator.
-  AwWebResourceRequest(AwWebResourceRequest&& other);
-  AwWebResourceRequest& operator=(AwWebResourceRequest&& other);
-  ~AwWebResourceRequest();
-
-  // The java equivalent
-  struct AwJavaWebResourceRequest {
-    AwJavaWebResourceRequest();
-    ~AwJavaWebResourceRequest();
-
-    base::android::ScopedJavaLocalRef<jstring> jurl;
-    base::android::ScopedJavaLocalRef<jstring> jmethod;
-    base::android::ScopedJavaLocalRef<jobjectArray> jheader_names;
-    base::android::ScopedJavaLocalRef<jobjectArray> jheader_values;
-  };
-
-  // Convenience method to convert AwWebResourceRequest to Java equivalent.
-  static void ConvertToJava(JNIEnv* env,
-                            const AwWebResourceRequest& request,
-                            AwJavaWebResourceRequest* jRequest);
-
-  std::string url;
-  std::string method;
-  bool is_main_frame;
-  bool has_user_gesture;
-  std::vector<std::string> header_names;
-  std::vector<std::string> header_values;
-};
-
-}  // namespace android_webview
-
-#endif  // ANDROID_WEBVIEW_BROWSER_NET_AW_WEB_RESOURCE_REQUEST_H_