[iOS] Split Bookmarks UI Target

Splitting the "bookmarks" target further than it previously was. This
will allow the reuse of various components and creation of another
target which will enable an edit-only flow, with reduced dependencies.

Bug: 1133294
Change-Id: I62469eee5deb06279dc16d6a7a02d56fe48e76a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440310
Commit-Queue: Sebastien Lalancette <seblalancette@chromium.org>
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Reviewed-by: Sergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813743}

ios/chrome/browser/prefs/BUILD.gn

@@ -80,7 +80,8 @@ source_set("browser_prefs") {
     "//ios/chrome/browser/prerender:prerender_pref",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/ui/authentication",
-    "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bookmarks:constants",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/voice:prefs",
     "//ios/chrome/browser/web",
     "//ios/public/provider/chrome/browser",

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

@@ -5,14 +5,8 @@
 source_set("bookmarks") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "bookmark_edit_view_controller.h",
-    "bookmark_edit_view_controller.mm",
     "bookmark_empty_background.h",
     "bookmark_empty_background.mm",
-    "bookmark_folder_editor_view_controller.h",
-    "bookmark_folder_editor_view_controller.mm",
-    "bookmark_folder_view_controller.h",
-    "bookmark_folder_view_controller.mm",
     "bookmark_home_consumer.h",
     "bookmark_home_mediator.h",
     "bookmark_home_mediator.mm",
@@ -23,57 +17,39 @@ source_set("bookmarks") {
     "bookmark_interaction_controller.h",
     "bookmark_interaction_controller.mm",
     "bookmark_interaction_controller_delegate.h",
-    "bookmark_mediator.h",
-    "bookmark_mediator.mm",
-    "bookmark_model_bridge_observer.h",
-    "bookmark_model_bridge_observer.mm",
     "bookmark_navigation_controller.h",
     "bookmark_navigation_controller.mm",
     "bookmark_navigation_controller_delegate.h",
     "bookmark_navigation_controller_delegate.mm",
-    "bookmark_path_cache.h",
-    "bookmark_path_cache.mm",
     "bookmark_promo_controller.h",
     "bookmark_promo_controller.mm",
     "bookmark_transitioning_delegate.h",
     "bookmark_transitioning_delegate.mm",
-    "bookmark_utils_ios.h",
-    "bookmark_utils_ios.mm",
     "synced_bookmarks_bridge.h",
     "synced_bookmarks_bridge.mm",
-    "undo_manager_bridge_observer.h",
-    "undo_manager_bridge_observer.mm",
-    "undo_manager_wrapper.h",
-    "undo_manager_wrapper.mm",
   ]
   deps = [
     ":bookmarks_ui",
+    ":constants",
+    ":core",
     "resources:bookmark_blue_check",
     "resources:bookmark_blue_folder",
     "resources:bookmark_blue_new_folder",
     "resources:bookmark_empty",
     "resources:bookmark_empty_star",
     "//base",
-    "//base:i18n",
     "//components/bookmarks/browser",
     "//components/bookmarks/common",
     "//components/bookmarks/managed",
-    "//components/browser_sync",
-    "//components/pref_registry",
     "//components/prefs",
     "//components/prefs/ios",
-    "//components/query_parser",
     "//components/signin/public/identity_manager",
     "//components/signin/public/identity_manager/objc",
     "//components/strings",
-    "//components/undo",
-    "//components/url_formatter",
+    "//components/sync/driver",
     "//ios/chrome/app:tests_hook",
     "//ios/chrome/app/strings",
-    "//ios/chrome/app/theme",
-    "//ios/chrome/browser",
     "//ios/chrome/browser/bookmarks",
-    "//ios/chrome/browser/bookmarks:bookmarks_utils",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/drag_and_drop",
     "//ios/chrome/browser/favicon",
@@ -89,48 +65,114 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/bookmarks/cells",
-    "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/elements",
-    "//ios/chrome/browser/ui/icons",
-    "//ios/chrome/browser/ui/image_util",
     "//ios/chrome/browser/ui/keyboard",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/material_components",
     "//ios/chrome/browser/ui/menu",
-    "//ios/chrome/browser/ui/ntp",
     "//ios/chrome/browser/ui/sharing",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:feature_flags",
     "//ios/chrome/browser/ui/table_view:presentation",
     "//ios/chrome/browser/ui/table_view:styler",
     "//ios/chrome/browser/ui/table_view:views",
-    "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/util:multiwindow_util",
-    "//ios/chrome/browser/undo",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web_state_list",
     "//ios/chrome/browser/window_activities",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/favicon",
     "//ios/chrome/common/ui/util",
-    "//ios/public/provider/chrome/browser",
     "//ios/public/provider/chrome/browser/signin",
-    "//ios/public/provider/chrome/browser/ui",
-    "//ios/web",
     "//ui/base",
-    "//ui/gfx",
-    "//url",
   ]
-  allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ]
-  frameworks = [
-    "CoreGraphics.framework",
-    "QuartzCore.framework",
-    "UIKit.framework",
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("core") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "bookmark_mediator.h",
+    "bookmark_mediator.mm",
+    "bookmark_model_bridge_observer.h",
+    "bookmark_model_bridge_observer.mm",
+    "bookmark_path_cache.h",
+    "bookmark_path_cache.mm",
+    "bookmark_utils_ios.h",
+    "bookmark_utils_ios.mm",
+    "undo_manager_bridge_observer.h",
+    "undo_manager_bridge_observer.mm",
+    "undo_manager_wrapper.h",
+    "undo_manager_wrapper.mm",
   ]
+  deps = [
+    "//components/bookmarks/browser",
+    "//components/pref_registry",
+    "//components/prefs",
+    "//components/query_parser",
+    "//components/strings",
+    "//components/undo",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser:pref_names",
+    "//ios/chrome/browser:utils",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/colors",
+    "//ios/chrome/browser/ui/material_components",
+    "//ios/chrome/browser/ui/util",
+    "//ios/chrome/browser/undo",
+    "//ios/chrome/common/ui/colors",
+    "//ui/base",
+  ]
+  frameworks = [ "UIKit.framework" ]
 }
 
 source_set("bookmarks_ui") {
+  configs += [ "//build/config/compiler:enable_arc" ]
+  sources = [
+    "bookmark_edit_view_controller.h",
+    "bookmark_edit_view_controller.mm",
+    "bookmark_folder_editor_view_controller.h",
+    "bookmark_folder_editor_view_controller.mm",
+    "bookmark_folder_view_controller.h",
+    "bookmark_folder_view_controller.mm",
+  ]
+  deps = [
+    ":constants",
+    ":core",
+    "//base",
+    "//base:i18n",
+    "//components/bookmarks/browser",
+    "//components/strings",
+    "//components/url_formatter",
+    "//ios/chrome/app/strings",
+    "//ios/chrome/browser:utils",
+    "//ios/chrome/browser/bookmarks",
+    "//ios/chrome/browser/browser_state",
+    "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/ui/alert_coordinator",
+    "//ios/chrome/browser/ui/bookmarks/cells",
+    "//ios/chrome/browser/ui/commands",
+    "//ios/chrome/browser/ui/icons",
+    "//ios/chrome/browser/ui/image_util",
+    "//ios/chrome/browser/ui/keyboard",
+    "//ios/chrome/browser/ui/material_components",
+    "//ios/chrome/browser/ui/table_view",
+    "//ios/chrome/browser/ui/table_view:feature_flags",
+    "//ios/chrome/browser/ui/table_view:presentation",
+    "//ios/chrome/browser/ui/table_view:styler",
+    "//ios/chrome/browser/ui/table_view:views",
+    "//ios/chrome/common/ui/util",
+    "//ios/public/provider/chrome/browser",
+    "//ui/base",
+  ]
+  allow_circular_includes_from = [ "//ios/chrome/browser/ui/bookmarks/cells" ]
+  frameworks = [ "UIKit.framework" ]
+}
+
+source_set("constants") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
     "bookmark_ui_constants.h",
@@ -168,6 +210,9 @@ source_set("unit_tests") {
   ]
   deps = [
     ":bookmarks",
+    ":bookmarks_ui",
+    ":constants",
+    ":core",
     ":test_support",
     "//base",
     "//base/test:test_support",
@@ -200,7 +245,7 @@ source_set("eg2_tests") {
     "managed_bookmarks_egtest.mm",
   ]
   deps = [
-    ":bookmarks_ui",
+    ":constants",
     ":eg_test_support+eg2",
     "//base/test:test_support",
     "//components/policy:generated",
@@ -238,7 +283,8 @@ source_set("eg_app_support+eg2") {
   ]
   deps = [
     ":bookmarks",
-    ":bookmarks_ui",
+    ":constants",
+    ":core",
     "//base",
     "//base/test:test_support",
     "//components/bookmarks/browser",
@@ -276,7 +322,7 @@ source_set("eg_test_support+eg2") {
     "bookmark_earl_grey_ui.mm",
   ]
   deps = [
-    ":bookmarks_ui",
+    ":constants",
     "//base",
     "//base/test:test_support",
     "//components/strings",

ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.mm

@@ -24,8 +24,6 @@
 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_parent_folder_item.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_text_field_item.h"
-#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
-#import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 #import "ios/chrome/browser/ui/commands/browser_commands.h"
 #import "ios/chrome/browser/ui/icons/chrome_icon.h"
 #import "ios/chrome/browser/ui/material_components/utils.h"

ios/chrome/browser/ui/bookmarks/bookmark_folder_view_controller.mm

@@ -13,7 +13,6 @@
 #include "components/bookmarks/browser/bookmark_model.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_folder_editor_view_controller.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_model_bridge_observer.h"
-#import "ios/chrome/browser/ui/bookmarks/bookmark_navigation_controller.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_ui_constants.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
 #import "ios/chrome/browser/ui/bookmarks/cells/bookmark_folder_item.h"

ios/chrome/browser/ui/bookmarks/bookmark_mediator.mm

@@ -17,8 +17,6 @@
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/pref_names.h"
-#import "ios/chrome/browser/ui/bookmarks/bookmark_edit_view_controller.h"
-#import "ios/chrome/browser/ui/bookmarks/bookmark_home_view_controller.h"
 #import "ios/chrome/browser/ui/bookmarks/bookmark_utils_ios.h"
 #include "ios/chrome/browser/ui/util/uikit_ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/bookmarks/cells/BUILD.gn

@@ -28,7 +28,8 @@ source_set("cells") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/ui/authentication",
     "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/bookmarks:constants",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/colors",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/table_view:styler",

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

@@ -37,7 +37,7 @@ source_set("eg2_tests") {
   deps = [
     "//components/strings",
     "//ios/chrome/app/strings",
-    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/bookmarks:constants",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/table_view:constants",
     "//ios/chrome/test/earl_grey:eg_test_support+eg2",

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

@@ -67,7 +67,7 @@ source_set("popup_menu") {
     "//ios/chrome/browser/translate",
     "//ios/chrome/browser/ui:feature_flags",
     "//ios/chrome/browser/ui/activity_services",
-    "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/bubble",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",

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

@@ -39,7 +39,7 @@ source_set("toolbar") {
     "//ios/chrome/browser/policy:feature_flags",
     "//ios/chrome/browser/reading_list",
     "//ios/chrome/browser/search_engines",
-    "//ios/chrome/browser/ui/bookmarks",
+    "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/broadcaster",
     "//ios/chrome/browser/ui/commands",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",

ios/chrome/test/earl_grey/BUILD.gn

@@ -93,7 +93,7 @@ source_set("eg_app_support+eg2") {
     "//ios/chrome/browser/ui/autofill:eg_app_support+eg2",
     "//ios/chrome/browser/ui/autofill/manual_fill",
     "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
-    "//ios/chrome/browser/ui/bookmarks:bookmarks_ui",
+    "//ios/chrome/browser/ui/bookmarks:constants",
     "//ios/chrome/browser/ui/bookmarks:eg_app_support+eg2",
     "//ios/chrome/browser/ui/collection_view/cells",
     "//ios/chrome/browser/ui/commands",