Move wk_security_origin_util.* into //ios/web/web_view:util

This CL moves //ios/web/web_state/ui/wk_security_origin_util.* into
//ios/web/web_view:util, so that they can be shared with
//ios/web/js_messaging for further refactor.

Bug: 956516
Change-Id: Ie507f63e5fe6655e7fba9224c7abad0a40f990df
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1674093
Commit-Queue: Yi Su <mrsuyi@chromium.org>
Reviewed-by: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#672002}

ios/web/BUILD.gn

@@ -478,7 +478,6 @@ source_set("ios_web_web_state_unittests") {
   sources = [
     "web_state/context_menu_params_utils_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",
     "web_state/web_state_impl_unittest.mm",
     "web_state/web_state_observer_bridge_unittest.mm",

ios/web/web_state/ui/BUILD.gn

@@ -63,8 +63,6 @@ source_set("ui") {
     "crw_wk_ui_handler_delegate.h",
     "js_window_error_manager.h",
     "js_window_error_manager.mm",
-    "wk_security_origin_util.h",
-    "wk_security_origin_util.mm",
   ]
 
   libs = [ "WebKit.framework" ]

ios/web/web_state/ui/crw_web_controller.mm

@@ -56,12 +56,12 @@
 #import "ios/web/web_state/ui/crw_wk_ui_handler.h"
 #import "ios/web/web_state/ui/crw_wk_ui_handler_delegate.h"
 #import "ios/web/web_state/ui/js_window_error_manager.h"
-#import "ios/web/web_state/ui/wk_security_origin_util.h"
 #import "ios/web/web_state/ui/wk_web_view_configuration_provider.h"
 #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/content_type_util.h"
+#import "ios/web/web_view/wk_security_origin_util.h"
 #import "ios/web/web_view/wk_web_view_util.h"
 #import "net/base/mac/url_conversions.h"
 #include "services/metrics/public/cpp/ukm_builders.h"

ios/web/web_state/ui/crw_wk_ui_handler.mm

@@ -12,9 +12,9 @@
 #include "ios/web/public/web_state/web_state_interface_provider.h"
 #import "ios/web/web_state/ui/crw_context_menu_controller.h"
 #import "ios/web/web_state/ui/crw_wk_ui_handler_delegate.h"
-#import "ios/web/web_state/ui/wk_security_origin_util.h"
 #import "ios/web/web_state/user_interaction_state.h"
 #import "ios/web/web_state/web_state_impl.h"
+#import "ios/web/web_view/wk_security_origin_util.h"
 #import "ios/web/webui/mojo_facade.h"
 #import "net/base/mac/url_conversions.h"
 #include "url/gurl.h"

ios/web/web_view/BUILD.gn

@@ -10,6 +10,8 @@ source_set("util") {
     "content_type_util.h",
     "error_translation_util.h",
     "error_translation_util.mm",
+    "wk_security_origin_util.h",
+    "wk_security_origin_util.mm",
     "wk_web_view_util.h",
     "wk_web_view_util.mm",
   ]
@@ -42,6 +44,7 @@ source_set("unittests") {
   sources = [
     "content_type_util_unittest.cc",
     "error_translation_util_unittest.mm",
+    "wk_security_origin_util_unittest.mm",
     "wk_web_view_util_unittest.mm",
   ]
 }

ios/web/web_state/ui/wk_security_origin_util.h → ios/web/web_view/wk_security_origin_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_UI_WK_SECURITY_ORIGIN_UTIL_H_
-#define IOS_WEB_WEB_STATE_UI_WK_SECURITY_ORIGIN_UTIL_H_
+#ifndef IOS_WEB_WEB_VIEW_WK_SECURITY_ORIGIN_UTIL_H_
+#define IOS_WEB_WEB_VIEW_WK_SECURITY_ORIGIN_UTIL_H_
 
 #include "url/gurl.h"
 
@@ -17,4 +17,4 @@ GURL GURLOriginWithWKSecurityOrigin(WKSecurityOrigin* origin);
 
 }  // namespace web
 
-#endif  // IOS_WEB_WEB_STATE_UI_WK_SECURITY_ORIGIN_UTIL_H_
+#endif  // IOS_WEB_WEB_VIEW_WK_SECURITY_ORIGIN_UTIL_H_

ios/web/web_state/ui/wk_security_origin_util.mm → ios/web/web_view/wk_security_origin_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/ui/wk_security_origin_util.h"
+#import "ios/web/web_view/wk_security_origin_util.h"
 
 #import <WebKit/WebKit.h>
 

ios/web/web_state/ui/wk_security_origin_util_unittest.mm → ios/web/web_view/wk_security_origin_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/ui/wk_security_origin_util.h"
+#import "ios/web/web_view/wk_security_origin_util.h"
 
 #import <WebKit/WebKit.h>