Move url_scheme_util* to ios/web/common.

ios/web/common directory contains common code shared between //ios/web
and the rest of the layers (//components, //ios/chrome, //ios/web_view).
This directory does not contain the public API to create and manage web
contents (//ios/web/public is public API directory).

The files which are moved in this CL contain 2 functions:
 - bool UrlHasWebScheme(const GURL& url)
 - bool UrlHasWebScheme(NSURL* url))
Both these functions conceptually belong to ios/web, but they don't belong
to ios/web/public. ios/web/common is existing directory, which mirrors
content/common, and ios/web/common seems like the most appropriate place
for these functions among existing directories.

The proposal to move the files was discussed on this doc:
https://docs.google.com/document/d/1C2YIU0rDbH5wz2VI6nk0COrktwY3DbF-e7QbMIAKEJc/edit

Bug: 942244
Change-Id: Ib5c09134b3026f25e545fb436c9313b71b7a4c74
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1709000
Commit-Queue: Eugene But <eugenebut@chromium.org>
Reviewed-by: Yi Su <mrsuyi@chromium.org>
Reviewed-by: John Wu <jzw@chromium.org>
Reviewed-by: Moe Ahmadi <mahmadi@chromium.org>
Auto-Submit: Eugene But <eugenebut@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680050}

components/autofill/ios/browser/autofill_agent.mm

@@ -45,13 +45,13 @@
 #import "components/prefs/ios/pref_observer_bridge.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/prefs/pref_service.h"
+#include "ios/web/common/url_scheme_util.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #include "ios/web/public/deprecated/url_verification_constants.h"
 #include "ios/web/public/js_messaging/web_frame.h"
 #include "ios/web/public/js_messaging/web_frame_util.h"
 #import "ios/web/public/js_messaging/web_frames_manager.h"
 #import "ios/web/public/navigation/navigation_context.h"
-#include "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 #include "ui/gfx/geometry/rect.h"

components/translate/ios/DEPS

 include_rules = [
   "+ios/web/public",
+  "+ios/web/common",
   "+third_party/ocmock",
 ]

components/translate/ios/browser/BUILD.gn

@@ -30,6 +30,7 @@ source_set("browser") {
     "//components/translate/core/common",
     "//components/translate/core/language_detection",
     "//ios/chrome/browser/metrics:ukm_url_recorder",
+    "//ios/web/common",
     "//ios/web/public",
     "//ios/web/public/deprecated",
     "//ios/web/public/js_messaging",

components/translate/ios/browser/language_detection_controller.mm

@@ -17,9 +17,9 @@
 #include "components/translate/core/language_detection/language_detection_util.h"
 #import "components/translate/ios/browser/js_language_detection_manager.h"
 #include "components/translate/ios/browser/string_clipping_util.h"
+#import "ios/web/common/url_scheme_util.h"
 #include "ios/web/public/js_messaging/web_frame.h"
 #import "ios/web/public/navigation/navigation_context.h"
-#import "ios/web/public/url_scheme_util.h"
 #include "ios/web/public/web_state/web_state.h"
 #include "net/http/http_response_headers.h"
 

ios/chrome/browser/app_launcher/BUILD.gn

@@ -23,6 +23,7 @@ source_set("app_launcher") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/u2f",
+    "//ios/web/common",
     "//ios/web/public",
     "//url",
   ]

ios/chrome/browser/app_launcher/app_launcher_tab_helper.mm

@@ -17,9 +17,9 @@
 #import "ios/chrome/browser/chrome_url_util.h"
 #include "ios/chrome/browser/reading_list/reading_list_model_factory.h"
 #import "ios/chrome/browser/u2f/u2f_tab_helper.h"
+#import "ios/web/common/url_scheme_util.h"
 #import "ios/web/public/navigation/navigation_item.h"
 #import "ios/web/public/navigation/navigation_manager.h"
-#import "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_client.h"
 #import "net/base/mac/url_conversions.h"
 #include "url/gurl.h"

ios/chrome/browser/autofill/BUILD.gn

@@ -72,6 +72,7 @@ source_set("autofill") {
     "//ios/chrome/browser/webdata_services",
     "//ios/chrome/common/colors",
     "//ios/chrome/common/ui_util",
+    "//ios/web/common",
     "//ios/web/public/deprecated",
     "//ios/web/public/js_messaging",
     "//third_party/leveldatabase",

ios/chrome/browser/autofill/form_suggestion_controller.mm

@@ -20,9 +20,9 @@
 #import "ios/chrome/browser/autofill/form_suggestion_view.h"
 #import "ios/chrome/browser/passwords/password_generation_utils.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
+#import "ios/web/common/url_scheme_util.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #import "ios/web/public/js_messaging/web_frames_manager.h"
-#import "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_state/ui/crw_web_view_proxy.h"
 #import "ios/web/public/web_state/web_state.h"
 

ios/chrome/browser/passwords/password_controller.mm

@@ -61,9 +61,10 @@
 #include "ios/chrome/browser/web/tab_id_tab_helper.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/web/common/origin_util.h"
+#include "ios/web/common/url_scheme_util.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #include "ios/web/public/js_messaging/web_frame.h"
-#include "ios/web/public/url_scheme_util.h"
+#include "ios/web/public/js_messaging/web_frame_util.h"
 #import "ios/web/public/web_state/web_state.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 #include "ui/base/l10n/l10n_util_mac.h"

ios/chrome/browser/ui/autofill/BUILD.gn

@@ -58,6 +58,7 @@ source_set("autofill") {
     "//ios/public/provider/chrome/browser",
     "//ios/third_party/material_components_ios",
     "//ios/third_party/material_roboto_font_loader_ios",
+    "//ios/web/common",
     "//ios/web/public/deprecated",
     "//ios/web/public/js_messaging",
     "//ui/base",

ios/chrome/browser/ui/autofill/form_input_accessory_mediator.mm

@@ -26,10 +26,10 @@
 #import "ios/chrome/browser/ui/util/keyboard_observer_helper.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
+#import "ios/web/common/url_scheme_util.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #include "ios/web/public/js_messaging/web_frame.h"
 #include "ios/web/public/js_messaging/web_frames_manager.h"
-#import "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_state/web_state.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/browser_view/browser_view_controller.mm

@@ -182,13 +182,13 @@
 #include "ios/public/provider/chrome/browser/voice/voice_search_controller.h"
 #include "ios/public/provider/chrome/browser/voice/voice_search_provider.h"
 #import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
+#include "ios/web/common/url_scheme_util.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #import "ios/web/public/deprecated/crw_native_content_holder.h"
 #import "ios/web/public/deprecated/crw_native_content_provider.h"
 #import "ios/web/public/deprecated/crw_web_controller_util.h"
 #include "ios/web/public/navigation/navigation_item.h"
 #include "ios/web/public/thread/web_thread.h"
-#include "ios/web/public/url_scheme_util.h"
 #include "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #import "ios/web/public/web_state/ui/crw_web_view_proxy.h"

ios/chrome/browser/ui/payments/payment_request_manager.mm

@@ -57,6 +57,7 @@
 #import "ios/chrome/browser/ui/payments/payment_request_coordinator.h"
 #import "ios/chrome/browser/ui/payments/payment_request_error_coordinator.h"
 #include "ios/web/common/origin_util.h"
+#import "ios/web/common/url_scheme_util.h"
 #import "ios/web/public/deprecated/crw_js_injection_receiver.h"
 #include "ios/web/public/deprecated/url_verification_constants.h"
 #include "ios/web/public/favicon/favicon_status.h"
@@ -66,7 +67,6 @@
 #include "ios/web/public/navigation/navigation_item.h"
 #include "ios/web/public/navigation/navigation_manager.h"
 #include "ios/web/public/security/ssl_status.h"
-#import "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_state/ui/crw_web_view_proxy.h"
 #import "ios/web/public/web_state/web_state.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"

ios/chrome/browser/upgrade/BUILD.gn

@@ -16,7 +16,7 @@ source_set("upgrade") {
     "//components/version_info",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/ui/commands",
-    "//ios/web",
+    "//ios/web/common",
     "//net",
     "//ui/base",
     "//ui/gfx",

ios/chrome/browser/upgrade/upgrade_center.mm

@@ -20,7 +20,7 @@
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
 #include "ios/chrome/grit/ios_strings.h"
-#import "ios/web/public/url_scheme_util.h"
+#import "ios/web/common/url_scheme_util.h"
 #import "net/base/mac/url_conversions.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"

ios/web/BUILD.gn

@@ -70,7 +70,6 @@ source_set("web") {
     "browser_url_rewriter_impl.mm",
     "crw_navigation_item_storage.mm",
     "network_context_owner.cc",
-    "url_scheme_util.mm",
     "web_client.mm",
   ]
 
@@ -283,7 +282,6 @@ source_set("ios_web_general_unittests") {
     "network_context_owner_unittest.cc",
     "service_manager_connection_impl_unittest.cc",
     "test/web_test_unittest.mm",
-    "url_scheme_util_unittest.mm",
     "web_client_unittest.mm",
     "web_thread_unittest.cc",
   ]

ios/web/common/BUILD.gn

@@ -15,6 +15,8 @@ source_set("common") {
     "origin_util.mm",
     "referrer_util.cc",
     "referrer_util.h",
+    "url_scheme_util.h",
+    "url_scheme_util.mm",
     "url_util.cc",
     "url_util.h",
   ]
@@ -64,6 +66,7 @@ source_set("unittests") {
   sources = [
     "origin_util_unittest.mm",
     "referrer_util_unittest.cc",
+    "url_scheme_util_unittest.mm",
     "url_util_unittest.cc",
   ]
 }

ios/web/public/url_scheme_util.h → ios/web/common/url_scheme_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_PUBLIC_URL_SCHEME_UTIL_H_
-#define IOS_WEB_PUBLIC_URL_SCHEME_UTIL_H_
+#ifndef IOS_WEB_COMMON_URL_SCHEME_UTIL_H_
+#define IOS_WEB_COMMON_URL_SCHEME_UTIL_H_
 
 class GURL;
 @class NSURL;
@@ -22,4 +22,4 @@ bool UrlHasWebScheme(NSURL* url);
 
 }  // namespace web
 
-#endif  // IOS_WEB_PUBLIC_URL_SCHEME_UTIL_H_
+#endif  // IOS_WEB_COMMON_URL_SCHEME_UTIL_H_

ios/web/url_scheme_util.mm → ios/web/common/url_scheme_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/public/url_scheme_util.h"
+#import "ios/web/common/url_scheme_util.h"
 
 #import <Foundation/Foundation.h>
 
@@ -16,8 +16,7 @@
 namespace web {
 
 bool UrlHasWebScheme(const GURL& url) {
-  return url.SchemeIs(url::kHttpScheme) ||
-         url.SchemeIs(url::kHttpsScheme) ||
+  return url.SchemeIs(url::kHttpScheme) || url.SchemeIs(url::kHttpsScheme) ||
          url.SchemeIs(url::kDataScheme);
 }
 

ios/web/url_scheme_util_unittest.mm → ios/web/common/url_scheme_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/public/url_scheme_util.h"
+#import "ios/web/common/url_scheme_util.h"
 
 #import <Foundation/Foundation.h>
 

ios/web/navigation/crw_wk_navigation_handler.mm

@@ -10,6 +10,7 @@
 #include "base/timer/timer.h"
 #import "ios/net/http_response_headers_util.h"
 #include "ios/web/common/features.h"
+#import "ios/web/common/url_scheme_util.h"
 #import "ios/web/js_messaging/crw_js_injector.h"
 #import "ios/web/js_messaging/web_frames_manager_impl.h"
 #import "ios/web/navigation/crw_pending_navigation_info.h"
@@ -26,7 +27,6 @@
 #import "ios/web/navigation/wk_navigation_util.h"
 #include "ios/web/public/browser_state.h"
 #import "ios/web/public/download/download_controller.h"
-#import "ios/web/public/url_scheme_util.h"
 #import "ios/web/public/web_client.h"
 #import "ios/web/security/crw_cert_verification_controller.h"
 #import "ios/web/security/wk_web_view_security_util.h"

ios/web/public/BUILD.gn

@@ -30,7 +30,6 @@ source_set("public") {
     "java_script_dialog_presenter.h",
     "java_script_dialog_type.h",
     "service_manager_connection.h",
-    "url_scheme_util.h",
     "url_schemes.mm",
     "web_client.h",
     "web_state/page_display_state.mm",

ios/web_view/internal/passwords/cwv_password_controller.mm

@@ -16,8 +16,9 @@
 #import "components/password_manager/ios/password_form_helper.h"
 #import "components/password_manager/ios/password_suggestion_helper.h"
 #import "ios/web/common/origin_util.h"
+#include "ios/web/common/url_scheme_util.h"
 #include "ios/web/public/js_messaging/web_frame.h"
-#include "ios/web/public/url_scheme_util.h"
+#include "ios/web/public/js_messaging/web_frame_util.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 #import "ios/web_view/internal/autofill/cwv_autofill_suggestion_internal.h"
 #import "ios/web_view/internal/passwords/web_view_password_manager_client.h"