Move error_translation_util.* into //ios/web/web_view.

This CL moves //ios/web/web_state/error_translation_util* into
//ios/web/web_view:util.

Bug: 942244,956511
Change-Id: Iee866e5f371e203720dfa3e128f848272ef78f86
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1630160Reviewed-by: Eugene But <eugenebut@chromium.org>
Commit-Queue: Yi Su <mrsuyi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663757}

ios/web/BUILD.gn

@@ -49,7 +49,6 @@ source_set("web") {
     "//ios/web/security",
     "//ios/web/session",
     "//ios/web/web_state",
-    "//ios/web/web_state:error_translation_util",
     "//ios/web/web_state:web_view_internal_creation_util",
     "//services/network:network_service",
     "//services/network/public/mojom",
@@ -426,7 +425,6 @@ source_set("ios_web_web_state_unittests") {
     "//ios/web/test/fakes",
     "//ios/web/web_state",
     "//ios/web/web_state:context_menu",
-    "//ios/web/web_state:error_translation_util",
     "//ios/web/web_state:web_view_internal_creation_util",
     "//net:test_support",
     "//services/service_manager/public/cpp",
@@ -439,7 +437,6 @@ source_set("ios_web_web_state_unittests") {
 
   sources = [
     "web_state/context_menu_params_utils_unittest.mm",
-    "web_state/error_translation_util_unittest.mm",
     "web_state/page_display_state_unittest.mm",
     "web_state/ui/wk_security_origin_util_unittest.mm",
     "web_state/web_state_delegate_bridge_unittest.mm",

ios/web/download/BUILD.gn

@@ -11,7 +11,7 @@ source_set("download") {
     "//ios/web/net/cookies",
     "//ios/web/public",
     "//ios/web/public/download",
-    "//ios/web/web_state:error_translation_util",
+    "//ios/web/web_view:util",
     "//ui/base",
   ]
 

ios/web/download/download_task_impl.mm

@@ -16,7 +16,7 @@
 #import "ios/web/public/web_state/web_state.h"
 #include "ios/web/public/web_task_traits.h"
 #include "ios/web/public/web_thread.h"
-#import "ios/web/web_state/error_translation_util.h"
+#import "ios/web/web_view/error_translation_util.h"
 #include "net/base/completion_once_callback.h"
 #include "net/base/data_url.h"
 #include "net/base/filename_util.h"

ios/web/public/test/BUILD.gn

@@ -65,10 +65,10 @@ source_set("util") {
     "//base",
     "//base/test:test_support",
     "//ios/web/public:public",
-    "//ios/web/web_state:error_translation_util",
     "//ios/web/web_state:web_state_impl_header",
     "//ios/web/web_state/js:script_util",
     "//ios/web/web_state/ui:ui",
+    "//ios/web/web_view:util",
     "//testing/gtest",
   ]
 

ios/web/public/test/error_test_util.mm

@@ -4,7 +4,7 @@
 
 #import "ios/web/public/test/error_test_util.h"
 
-#import "ios/web/web_state/error_translation_util.h"
+#import "ios/web/web_view/error_translation_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/web/web_state/BUILD.gn

@@ -58,22 +58,6 @@ source_set("web_state_impl_header") {
   configs += [ "//build/config/compiler:enable_arc" ]
 }
 
-source_set("error_translation_util") {
-  deps = [
-    "//base",
-    "//ios/net",
-    "//ios/web/public",
-    "//net",
-  ]
-
-  sources = [
-    "error_translation_util.h",
-    "error_translation_util.mm",
-  ]
-
-  configs += [ "//build/config/compiler:enable_arc" ]
-}
-
 source_set("page_viewport_state") {
   deps = [
     "//base",

ios/web/web_state/ui/BUILD.gn

@@ -30,7 +30,6 @@ source_set("ui") {
     "//ios/web/security",
     "//ios/web/session",
     "//ios/web/web_state:context_menu",
-    "//ios/web/web_state:error_translation_util",
     "//ios/web/web_state:page_viewport_state",
     "//ios/web/web_state:user_interaction",
     "//ios/web/web_state:web_state_impl_header",

ios/web/web_state/ui/crw_web_controller.mm

@@ -94,7 +94,6 @@
 #import "ios/web/security/web_interstitial_impl.h"
 #import "ios/web/security/wk_web_view_security_util.h"
 #import "ios/web/session/session_certificate_policy_cache_impl.h"
-#import "ios/web/web_state/error_translation_util.h"
 #import "ios/web/web_state/page_viewport_state.h"
 #import "ios/web/web_state/ui/controller/crw_legacy_native_content_controller.h"
 #import "ios/web/web_state/ui/controller/crw_legacy_native_content_controller_delegate.h"
@@ -115,6 +114,7 @@
 #import "ios/web/web_state/user_interaction_state.h"
 #import "ios/web/web_state/web_state_impl.h"
 #import "ios/web/web_state/web_view_internal_creation_util.h"
+#import "ios/web/web_view/error_translation_util.h"
 #import "ios/web/web_view/wk_web_view_util.h"
 #import "net/base/mac/url_conversions.h"
 #include "net/base/net_errors.h"

ios/web/web_view/BUILD.gn

@@ -6,12 +6,18 @@ import("//ios/build/config.gni")
 
 source_set("util") {
   sources = [
+    "error_translation_util.h",
+    "error_translation_util.mm",
     "wk_web_view_util.h",
     "wk_web_view_util.mm",
   ]
 
   deps = [
     "//base",
+    "//ios/net",
+    "//ios/web/public",
+    "//net",
+    "//url",
   ]
 
   configs += [ "//build/config/compiler:enable_arc" ]
@@ -24,10 +30,15 @@ source_set("unittests") {
     ":util",
     "//base",
     "//base/test:test_support",
+    "//ios/net",
+    "//ios/web/test:test_constants",
+    "//net",
     "//testing/gtest",
+    "//url",
   ]
 
   sources = [
+    "error_translation_util_unittest.mm",
     "wk_web_view_util_unittest.mm",
   ]
 }

ios/web/web_state/error_translation_util.h → ios/web/web_view/error_translation_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef IOS_WEB_WEB_STATE_ERROR_TRANSLATION_UTIL_H_
-#define IOS_WEB_WEB_STATE_ERROR_TRANSLATION_UTIL_H_
+#ifndef IOS_WEB_WEB_VIEW_ERROR_TRANSLATION_UTIL_H_
+#define IOS_WEB_WEB_VIEW_ERROR_TRANSLATION_UTIL_H_
 
 #import <Foundation/Foundation.h>
 
@@ -27,4 +27,4 @@ NSError* NetErrorFromError(NSError* error, int net_error_code);
 
 }  // namespace web
 
-#endif  // IOS_WEB_WEB_STATE_ERROR_TRANSLATION_UTIL_H_
+#endif  // IOS_WEB_WEB_VIEW_ERROR_TRANSLATION_UTIL_H_

ios/web/web_state/error_translation_util.mm → ios/web/web_view/error_translation_util.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/web/web_state/error_translation_util.h"
+#import "ios/web/web_view/error_translation_util.h"
 
 #include <CFNetwork/CFNetwork.h>
 #include <Foundation/Foundation.h>

ios/web/web_state/error_translation_util_unittest.mm → ios/web/web_view/error_translation_util_unittest.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ios/web/web_state/error_translation_util.h"
+#import "ios/web/web_view/error_translation_util.h"
 
 #import <Foundation/Foundation.h>