[iOS] Move chrome_coordinator to shared location

This CL moves the main coordinator class to a shared location as it is
used by a lot of different classes.

Bug: 1319852
Change-Id: I56fefe08e14908ddb6de60df2d8ba921b02a32d7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4323660
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Auto-Submit: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1115729}

ios/chrome/browser/autofill/BUILD.gn

@@ -185,11 +185,11 @@ source_set("unit_tests") {
     "//ios/chrome/browser/infobars",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/paths",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/ssl",
     "//ios/chrome/browser/sync:sync",
     "//ios/chrome/browser/ui/autofill",
     "//ios/chrome/browser/ui/autofill/form_input_accessory",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/settings:test_support",
     "//ios/chrome/browser/web:web_internal",
     "//ios/chrome/browser/webdata_services",

ios/chrome/browser/ui/coordinators/BUILD.gn → ios/chrome/browser/shared/coordinator/chrome_coordinator/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("chrome_coordinators") {
+source_set("chrome_coordinator") {
   sources = [
     "chrome_coordinator.h",
     "chrome_coordinator.mm",

ios/chrome/browser/ui/coordinators/chrome_coordinator.h → ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.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_CHROME_BROWSER_UI_COORDINATORS_CHROME_COORDINATOR_H_
-#define IOS_CHROME_BROWSER_UI_COORDINATORS_CHROME_COORDINATOR_H_
+#ifndef IOS_CHROME_BROWSER_SHARED_COORDINATOR_CHROME_COORDINATOR_CHROME_COORDINATOR_H_
+#define IOS_CHROME_BROWSER_SHARED_COORDINATOR_CHROME_COORDINATOR_CHROME_COORDINATOR_H_
 
 #import <UIKit/UIKit.h>
 
@@ -57,4 +57,4 @@ typedef NSMutableArray<ChromeCoordinator*> MutableCoordinatorArray;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_COORDINATORS_CHROME_COORDINATOR_H_
+#endif  // IOS_CHROME_BROWSER_SHARED_COORDINATOR_CHROME_COORDINATOR_CHROME_COORDINATOR_H_

ios/chrome/browser/ui/coordinators/chrome_coordinator.mm → ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.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/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 #import "ios/chrome/browser/main/browser.h"
 

ios/chrome/browser/store_kit/BUILD.gn

@@ -10,7 +10,7 @@ source_set("store_kit") {
   ]
   deps = [
     "//base",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/web",
   ]
   frameworks = [

ios/chrome/browser/store_kit/store_kit_coordinator.h

@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 // Coordinates presentation of SKStoreProductViewController.
 @interface StoreKitCoordinator : ChromeCoordinator

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

@@ -17,7 +17,7 @@ source_set("alert_coordinator") {
     "//components/strings",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/ui/dialogs:completion_block_util",
     "//ios/web",
     "//ui/base",

ios/chrome/browser/ui/alert_coordinator/alert_coordinator.h

@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #include "base/ios/block_types.h"
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 // A coordinator specialization for the case where the coordinator is creating
 // and managing a modal alert to be displayed to the user.

ios/chrome/browser/ui/alert_coordinator/repost_form_coordinator.h

@@ -8,7 +8,7 @@
 #import <UIKit/UIKit.h>
 
 #import "base/ios/block_types.h"
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 namespace web {
 class WebState;

ios/chrome/browser/ui/authentication/enterprise/enterprise_prompt/BUILD.gn

@@ -15,8 +15,8 @@ source_set("enterprise_prompt") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/policy/resources:enterprise_grey_icon_large",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/url:constants",
     "//ios/chrome/common/ui/confirmation_alert",
     "//ui/base",

ios/chrome/browser/ui/authentication/enterprise/enterprise_prompt/enterprise_prompt_coordinator.h

@@ -7,8 +7,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 #import "ios/chrome/browser/ui/authentication/enterprise/enterprise_prompt/enterprise_prompt_type.h"
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 
 // Delegate for the coordinator.
 @protocol EnterprisePromptCoordinatorDelegate

ios/chrome/browser/ui/authentication/signin/BUILD.gn

@@ -23,7 +23,7 @@ source_set("signin_headers") {
     "//base",
     "//components/signin/public/base",
     "//ios/chrome/browser/browser_state",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
   ]
 }
 

ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_account_chooser/BUILD.gn

@@ -25,6 +25,7 @@ source_set("consistency_account_chooser") {
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/net:crurl",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/signin",
@@ -34,7 +35,6 @@ source_set("consistency_account_chooser") {
     "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin:layout",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_sheet",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/ui/table_view:utils",
     "//ios/chrome/browser/url:constants",

ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_account_chooser/consistency_account_chooser_coordinator.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_SIGNIN_CONSISTENCY_PROMO_SIGNIN_CONSISTENCY_ACCOUNT_CHOOSER_CONSISTENCY_ACCOUNT_CHOOSER_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_AUTHENTICATION_SIGNIN_CONSISTENCY_PROMO_SIGNIN_CONSISTENCY_ACCOUNT_CHOOSER_CONSISTENCY_ACCOUNT_CHOOSER_COORDINATOR_H_
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 @class ConsistencyAccountChooserCoordinator;
 @protocol ConsistencyLayoutDelegate;

ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/BUILD.gn

@@ -20,6 +20,7 @@ source_set("consistency_default_account") {
     "//components/strings",
     "//ios/chrome/app/strings",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:system_identity",
@@ -29,7 +30,6 @@ source_set("consistency_default_account") {
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin:layout",
     "//ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_sheet",
     "//ios/chrome/browser/ui/authentication/views",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/common/ui/colors",
     "//ios/chrome/common/ui/util",
     "//ui/base",

ios/chrome/browser/ui/authentication/signin/consistency_promo_signin/consistency_default_account/consistency_default_account_coordinator.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_SIGNIN_CONSISTENCY_PROMO_SIGNIN_CONSISTENCY_DEFAULT_ACCOUNT_CONSISTENCY_DEFAULT_ACCOUNT_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_AUTHENTICATION_SIGNIN_CONSISTENCY_PROMO_SIGNIN_CONSISTENCY_DEFAULT_ACCOUNT_CONSISTENCY_DEFAULT_ACCOUNT_COORDINATOR_H_
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 @class ConsistencyDefaultAccountCoordinator;
 @protocol ConsistencyLayoutDelegate;

ios/chrome/browser/ui/authentication/signin/signin_coordinator.h

@@ -9,9 +9,9 @@
 
 #import "base/ios/block_types.h"
 #import "components/signin/public/base/signin_metrics.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 #import "ios/chrome/browser/ui/authentication/signin/signin_completion_info.h"
 #import "ios/chrome/browser/ui/authentication/signin/signin_constants.h"
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 
 class Browser;
 namespace syncer {

ios/chrome/browser/ui/authentication/unified_consent/BUILD.gn

@@ -17,12 +17,12 @@ source_set("unified_consent") {
     "//base",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:system_identity",
     "//ios/chrome/browser/ui/authentication/enterprise:enterprise_utils",
     "//ios/chrome/browser/ui/authentication/unified_consent/identity_chooser",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
   ]
 }
 

ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/BUILD.gn

@@ -19,10 +19,10 @@ source_set("identity_chooser") {
     "//components/prefs",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/signin",
     "//ios/chrome/browser/signin:system_identity",
     "//ios/chrome/browser/ui/authentication/cells",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
   ]
 }
 

ios/chrome/browser/ui/authentication/unified_consent/identity_chooser/identity_chooser_coordinator.h

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 @protocol IdentityChooserCoordinatorDelegate;
 @protocol SystemIdentity;

ios/chrome/browser/ui/authentication/unified_consent/unified_consent_coordinator.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_AUTHENTICATION_UNIFIED_CONSENT_UNIFIED_CONSENT_COORDINATOR_H_
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 #include <vector>
 

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

@@ -51,6 +51,7 @@ source_set("form_input_accessory") {
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/passwords",
     "//ios/chrome/browser/prefs:pref_names",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/util",
@@ -59,7 +60,6 @@ source_set("form_input_accessory") {
     "//ios/chrome/browser/ui/autofill/manual_fill",
     "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
     "//ios/chrome/browser/ui/autofill/resources:monotone_branding_icon",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/default_promo:utils",
     "//ios/chrome/browser/ui/main:scene_state_header",
     "//ios/chrome/browser/web_state_list",

ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_coordinator.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_AUTOFILL_FORM_INPUT_ACCESSORY_FORM_INPUT_ACCESSORY_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_AUTOFILL_FORM_INPUT_ACCESSORY_FORM_INPUT_ACCESSORY_COORDINATOR_H_
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 #import "ios/web/common/crw_input_view_provider.h"
 
 @class ManualFillInjectionHandler;

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

@@ -24,13 +24,13 @@
 #import "ios/chrome/browser/autofill/form_suggestion_tab_helper.h"
 #import "ios/chrome/browser/autofill/manual_fill/passwords_fetcher.h"
 #import "ios/chrome/browser/prefs/pref_names.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 #import "ios/chrome/browser/shared/public/commands/security_alert_commands.h"
 #import "ios/chrome/browser/shared/public/features/features.h"
 #import "ios/chrome/browser/shared/ui/util/uikit_ui_util.h"
 #import "ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_chromium_text_data.h"
 #import "ios/chrome/browser/ui/autofill/form_input_accessory/form_input_accessory_consumer.h"
 #import "ios/chrome/browser/ui/autofill/form_input_accessory/form_suggestion_view.h"
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 #import "ios/chrome/browser/ui/default_promo/default_browser_utils.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #import "ios/chrome/common/ui/elements/form_input_accessory_view.h"

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

@@ -52,12 +52,12 @@ source_set("manual_fill") {
     "//ios/chrome/browser/main",
     "//ios/chrome/browser/net:crurl",
     "//ios/chrome/browser/passwords",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/autofill/manual_fill:manual_fill_ui",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/list_model:list_model",
     "//ios/chrome/browser/ui/table_view:table_view",
     "//ios/chrome/browser/web_state_list:web_state_list",

ios/chrome/browser/ui/autofill/manual_fill/fallback_coordinator.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_FALLBACK_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_AUTOFILL_MANUAL_FILL_FALLBACK_COORDINATOR_H_
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 @class ChromeTableViewController;
 @class FallbackCoordinator;

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

@@ -73,10 +73,10 @@ source_set("badges") {
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/common/infobars",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/features",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/fullscreen:ui",
     "//ios/chrome/browser/ui/icons:symbols",
@@ -116,10 +116,10 @@ source_set("badges_popup_menu") {
     "//ios/chrome/browser/infobars/overlays",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/overlays",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/ui/util",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/list_model",
     "//ios/chrome/browser/ui/main:layout_guide_util",

ios/chrome/browser/ui/badges/badge_popup_menu_coordinator.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_BADGES_BADGE_POPUP_MENU_COORDINATOR_H_
 #define IOS_CHROME_BROWSER_UI_BADGES_BADGE_POPUP_MENU_COORDINATOR_H_
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 @protocol BadgeItem;
 

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

@@ -30,6 +30,7 @@ source_set("bookmarks") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/metrics:metrics_internal",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/shared/ui/util",
     "//ios/chrome/browser/shared/ui/util:url_with_title",
@@ -42,7 +43,6 @@ source_set("bookmarks") {
     "//ios/chrome/browser/ui/bookmarks/folder_chooser",
     "//ios/chrome/browser/ui/bookmarks/folder_editor",
     "//ios/chrome/browser/ui/bookmarks/home",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/default_promo:utils",
     "//ios/chrome/browser/ui/table_view",
     "//ios/chrome/browser/url_loading",

ios/chrome/browser/ui/bookmarks/bookmarks_coordinator.h

@@ -6,8 +6,8 @@
 
 #import <UIKit/UIKit.h>
 
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 #import "ios/chrome/browser/shared/public/commands/bookmarks_commands.h"
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
 
 class Browser;
 @protocol BookmarksCoordinatorDelegate;

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

@@ -22,13 +22,13 @@ source_set("editor") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/main:public",
     "//ios/chrome/browser/prefs:pref_names",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/sync",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/bookmarks:core",
     "//ios/chrome/browser/ui/bookmarks:utils",
     "//ios/chrome/browser/ui/bookmarks/folder_chooser",
     "//ios/chrome/browser/ui/bookmarks/folder_editor",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/table_view",
     "//ui/base",
     "//url",
@@ -54,6 +54,7 @@ source_set("editor_ui") {
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/flags:system_flags",
     "//ios/chrome/browser/main:public",
+    "//ios/chrome/browser/shared/coordinator/chrome_coordinator",
     "//ios/chrome/browser/shared/public/commands",
     "//ios/chrome/browser/ui/alert_coordinator",
     "//ios/chrome/browser/ui/bookmarks:constants",
@@ -62,7 +63,6 @@ source_set("editor_ui") {
     "//ios/chrome/browser/ui/bookmarks/cells",
     "//ios/chrome/browser/ui/bookmarks/folder_chooser",
     "//ios/chrome/browser/ui/bookmarks/folder_editor",
-    "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/icons",
     "//ios/chrome/browser/ui/icons:symbols",
     "//ios/chrome/browser/ui/icons/resources:cloud_slash",

ios/chrome/browser/ui/bookmarks/editor/bookmarks_editor_coordinator.h

@@ -7,7 +7,7 @@
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/coordinators/chrome_coordinator.h"
+#import "ios/chrome/browser/shared/coordinator/chrome_coordinator/chrome_coordinator.h"
 
 namespace bookmarks {
 class BookmarkNode;

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

@@ -22,7 +22,7 @@ source_set("coordinator_headers") {
     "bookmarks_folder_chooser_coordinator.h",
     "bookmarks_folder_chooser_coordinator_delegate.h",
   ]
-  public_deps = [ "//ios/chrome/browser/ui/coordinators:chrome_coordinators" ]
+  public_deps = [ "//ios/chrome/browser/shared/coordinator/chrome_coordinator" ]
 }
 
 # Do not include this target. Prefer :folder_chooser instead.