[Code Health][iOS] Move ios/chrome/browser/web to model subfolder

To simplify the folder hierarchy on iOS and have a clearer layer separation, all the files in ios/c/b/<foo>/ will be moved to ios/c/b/<foo>/model/ to showcase that they are model files. Make public dependency available for test and migrate it. Bug: 1480376 Change-Id: Ib1cdc5ddec723303c6c014d2e798b5e4806ff207 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5089949 Auto-Submit: Weizhong Xia <weizhong@google.com> Commit-Queue: Weizhong Xia <weizhong@google.com> Reviewed-by: Sylvain Defresne <sdefresne@chromium.org> Cr-Commit-Position: refs/heads/main@{#1233984}
qweri0p · Dec 6, 2023 · 34ec8f6 · 34ec8f6
1 parent d43e4a6
commit 34ec8f6
Show file tree

Hide file tree

Showing 17 changed files with 89 additions and 22 deletions.
diff --git a/ios/chrome/browser/web/model/BUILD.gn b/ios/chrome/browser/web/model/BUILD.gn
@@ -61,3 +61,23 @@ source_set("feature_flags") {
   sources = [ "features.h" ]
   public_deps = [ "//ios/chrome/browser/web:feature_flags" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web:unit_tests" ]
+}
+
+source_set("unit_tests_internal") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web:unit_tests_internal" ]
+}
+
+source_set("eg_app_support+eg2") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web:eg_app_support+eg2" ]
+}
+
+source_set("eg2_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web:eg2_tests" ]
+}
diff --git a/ios/chrome/browser/web/model/choose_file/BUILD.gn b/ios/chrome/browser/web/model/choose_file/BUILD.gn
@@ -0,0 +1,10 @@
+# Copyright 2023 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//ios/web/public/js_messaging/optimize_ts.gni")
+
+source_set("unit_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web/choose_file:unit_tests" ]
+}
diff --git a/ios/chrome/browser/web/model/font_size/BUILD.gn b/ios/chrome/browser/web/model/font_size/BUILD.gn
@@ -11,3 +11,8 @@ source_set("font_size") {
   ]
   public_deps = [ "//ios/chrome/browser/web/font_size" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web/font_size:unit_tests" ]
+}
diff --git a/ios/chrome/browser/web/model/image_fetch/BUILD.gn b/ios/chrome/browser/web/model/image_fetch/BUILD.gn
@@ -12,3 +12,12 @@ source_set("image_fetch") {
   ]
   public_deps = [ "//ios/chrome/browser/web/image_fetch" ]
 }
+
+fuzzer_test("image_fetch_java_script_feature_fuzzer") {
+  public_deps = [ "//ios/chrome/browser/web/image_fetch:image_fetch_java_script_feature_fuzzer" ]
+}
+
+source_set("unit_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web/image_fetch:unit_tests" ]
+}
diff --git a/ios/chrome/browser/web/model/java_script_console/BUILD.gn b/ios/chrome/browser/web/model/java_script_console/BUILD.gn
@@ -13,3 +13,8 @@ source_set("java_script_console") {
   ]
   public_deps = [ "//ios/chrome/browser/web/java_script_console" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web/java_script_console:unit_tests" ]
+}
diff --git a/ios/chrome/browser/web/model/print/BUILD.gn b/ios/chrome/browser/web/model/print/BUILD.gn
@@ -12,3 +12,8 @@ source_set("print") {
   ]
   public_deps = [ "//ios/chrome/browser/web/print" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web/print:unit_tests" ]
+}
diff --git a/ios/chrome/browser/web/model/session_state/BUILD.gn b/ios/chrome/browser/web/model/session_state/BUILD.gn
@@ -12,3 +12,8 @@ source_set("session_state") {
 
   public_deps = [ "//ios/chrome/browser/web/session_state" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+  public_deps = [ "//ios/chrome/browser/web/session_state:unit_tests" ]
+}
diff --git a/ios/chrome/browser/web/model/web_performance_metrics/BUILD.gn b/ios/chrome/browser/web/model/web_performance_metrics/BUILD.gn
@@ -14,3 +14,10 @@ source_set("web_performance_metrics") {
 
   public_deps = [ "//ios/chrome/browser/web/web_performance_metrics" ]
 }
+
+source_set("unit_tests") {
+  testonly = true
+
+  public_deps =
+      [ "//ios/chrome/browser/web/web_performance_metrics:unit_tests" ]
+}
diff --git a/ios/chrome/test/BUILD.gn b/ios/chrome/test/BUILD.gn
@@ -38,7 +38,7 @@ group("all_fuzzer_tests") {
   deps = [
     "//components/autofill/ios/form_util:form_activity_tab_helper_fuzzer",
     "//ios/chrome/browser/crash_report/model:crashpad_fuzzer_tests",
-    "//ios/chrome/browser/web/image_fetch:image_fetch_java_script_feature_fuzzer",
+    "//ios/chrome/browser/web/model/image_fetch:image_fetch_java_script_feature_fuzzer",
   ]
 }
 
@@ -138,7 +138,7 @@ source_set("ios_chrome_unit_test_suite") {
     "//ios/chrome/browser/browser_state/model",
     "//ios/chrome/browser/shared/model/paths",
     "//ios/chrome/browser/shared/model/url:constants",
-    "//ios/chrome/browser/web/web_performance_metrics:unit_tests",
+    "//ios/chrome/browser/web/model/web_performance_metrics:unit_tests",
     "//ios/chrome/test:test_support",
     "//ios/components/webui:url_constants",
     "//ios/public/provider/chrome/browser/app_utils:app_utils_api",
@@ -454,14 +454,14 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/url_loading/model:unit_tests",
     "//ios/chrome/browser/variations/model:unit_tests",
     "//ios/chrome/browser/voice/model:unit_tests",
-    "//ios/chrome/browser/web:unit_tests",
-    "//ios/chrome/browser/web:unit_tests_internal",
-    "//ios/chrome/browser/web/choose_file:unit_tests",
-    "//ios/chrome/browser/web/font_size:unit_tests",
-    "//ios/chrome/browser/web/image_fetch:unit_tests",
-    "//ios/chrome/browser/web/java_script_console:unit_tests",
-    "//ios/chrome/browser/web/print:unit_tests",
-    "//ios/chrome/browser/web/session_state:unit_tests",
+    "//ios/chrome/browser/web/model:unit_tests",
+    "//ios/chrome/browser/web/model:unit_tests_internal",
+    "//ios/chrome/browser/web/model/choose_file:unit_tests",
+    "//ios/chrome/browser/web/model/font_size:unit_tests",
+    "//ios/chrome/browser/web/model/image_fetch:unit_tests",
+    "//ios/chrome/browser/web/model/java_script_console:unit_tests",
+    "//ios/chrome/browser/web/model/print:unit_tests",
+    "//ios/chrome/browser/web/model/session_state:unit_tests",
     "//ios/chrome/browser/web_selection/model:unit_tests",
     "//ios/chrome/browser/web_state_list/model:unit_tests",
     "//ios/chrome/browser/web_state_list/model/web_usage_enabler:unit_tests",

diff --git a/ios/chrome/test/earl_grey/BUILD.gn b/ios/chrome/test/earl_grey/BUILD.gn
@@ -190,8 +190,8 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/unit_conversion:eg_app_support+eg2",
     "//ios/chrome/browser/unified_consent/model",
     "//ios/chrome/browser/variations/model:eg_app_support+eg2",
-    "//ios/chrome/browser/web",
-    "//ios/chrome/browser/web:eg_app_support+eg2",
+    "//ios/chrome/browser/web/model",
+    "//ios/chrome/browser/web/model:eg_app_support+eg2",
     "//ios/chrome/common/ui/promo_style:constants",
     "//ios/chrome/test/app:test_support",
     "//ios/chrome/test/variations_smoke_test:eg_app_support+eg2",
@@ -289,7 +289,7 @@ source_set("eg_test_support+eg2") {
     "//ios/chrome/browser/ui/tab_switcher/tab_grid:tab_grid_ui_constants",
     "//ios/chrome/browser/ui/tab_switcher/tab_grid/grid:grid_ui_constants",
     "//ios/chrome/browser/ui/toolbar:eg_test_support+eg2",
-    "//ios/chrome/browser/web:feature_flags",
+    "//ios/chrome/browser/web/model:feature_flags",
     "//ios/chrome/test:eg_test_support+eg2",
     "//ios/testing:http_server_bundle_data",
     "//ios/testing:nserror_support",

diff --git a/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm b/ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.mm
@@ -59,7 +59,7 @@
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
 #import "ios/chrome/browser/ui/popup_menu/overflow_menu/feature_flags.h"
 #import "ios/chrome/browser/unified_consent/model/unified_consent_service_factory.h"
-#import "ios/chrome/browser/web/web_navigation_browser_agent.h"
+#import "ios/chrome/browser/web/model/web_navigation_browser_agent.h"
 #import "ios/chrome/test/app/browsing_data_test_util.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
 #import "ios/chrome/test/app/navigation_test_util.h"

diff --git a/ios/chrome/test/earl_grey/chrome_test_case.mm b/ios/chrome/test/earl_grey/chrome_test_case.mm
@@ -18,7 +18,7 @@
 #import "base/test/ios/wait_util.h"
 #import "ios/chrome/browser/policy/policy_earl_grey_utils.h"
 #import "ios/chrome/browser/ui/ntp/new_tab_page_feature.h"
-#import "ios/chrome/browser/web/features.h"
+#import "ios/chrome/browser/web/model/features.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_app_interface.h"
 #import "ios/chrome/test/earl_grey/chrome_earl_grey_ui.h"

diff --git a/ios/chrome/test/earl_grey2/BUILD.gn b/ios/chrome/test/earl_grey2/BUILD.gn
@@ -265,7 +265,7 @@ chrome_ios_eg2_test("ios_chrome_variations_smoke_eg2tests_module") {
 chrome_ios_eg2_test("ios_chrome_web_eg2tests_module") {
   xcode_test_application_name = "ios_chrome_eg2tests"
 
-  deps = [ "//ios/chrome/browser/web:eg2_tests" ]
+  deps = [ "//ios/chrome/browser/web/model:eg2_tests" ]
   data_deps = [ ":ios_chrome_eg2tests" ]
 }
 

diff --git a/ios/chrome/test/fakes/BUILD.gn b/ios/chrome/test/fakes/BUILD.gn
@@ -40,7 +40,7 @@ source_set("fakes") {
     "//ios/chrome/browser/ui/overscroll_actions",
     "//ios/chrome/browser/ui/presenters",
     "//ios/chrome/browser/ui/settings/utils",
-    "//ios/chrome/browser/web:web_internal",
+    "//ios/chrome/browser/web/model:web_internal",
     "//ios/web/public",
     "//ios/web/public/download",
   ]

diff --git a/ios/chrome/test/providers/text_zoom/BUILD.gn b/ios/chrome/test/providers/text_zoom/BUILD.gn
@@ -6,7 +6,7 @@ source_set("text_zoom") {
   testonly = true
   sources = [ "test_text_zoom.mm" ]
   deps = [
-    "//ios/chrome/browser/web/font_size",
+    "//ios/chrome/browser/web/model/font_size",
     "//ios/public/provider/chrome/browser/text_zoom:text_zoom_api",
   ]
 }
diff --git a/ios/chrome/test/providers/text_zoom/test_text_zoom.mm b/ios/chrome/test/providers/text_zoom/test_text_zoom.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/chrome/browser/web/font_size/font_size_java_script_feature.h"
+#import "ios/chrome/browser/web/model/font_size/font_size_java_script_feature.h"
 #import "ios/public/provider/chrome/browser/text_zoom/text_zoom_api.h"
 
 namespace ios {

diff --git a/ios/components/security_interstitials/lookalikes/README.md b/ios/components/security_interstitials/lookalikes/README.md
@@ -1,5 +1,6 @@
 This directory contains shared iOS lookalike code.
 
-End-to-end tests are located in ios/chrome/browser/web. The ShouldAllowResponse
-tab helper code needs to be unit tested here in components, since
-lookalike_url_egtest.mm uses a custom policy decider that overrides that method.
+End-to-end tests are located in ios/chrome/browser/web/model. The
+ShouldAllowResponse tab helper code needs to be unit tested here in components,
+since lookalike_url_egtest.mm uses a custom policy decider that overrides that
+method.