[iOS][AlertView] Rename folder for consistency

This naming is more consistent with the rest of the sibling folders.

Bug: 959739
Change-Id: Ief587f052449c9d2bdfbf184ba0f4f996c897406
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943136Reviewed-by: Mark Cogan <marq@chromium.org>
Commit-Queue: Mark Cogan <marq@chromium.org>
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720200}

ios/chrome/browser/ui/alert_view_controller/BUILD.gn → ios/chrome/browser/ui/alert_view/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("alert_view_controller") {
+source_set("alert_view") {
   sources = [
     "alert_action.h",
     "alert_action.mm",
@@ -29,7 +29,7 @@ source_set("unit_tests") {
     "alert_view_controller_unittest.mm",
   ]
   deps = [
-    ":alert_view_controller",
+    ":alert_view",
     "//testing/gtest:gtest",
   ]
 }

ios/chrome/browser/ui/alert_view_controller/alert_action.h → ios/chrome/browser/ui/alert_view/alert_action.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_ALERT_VIEW_CONTROLLER_ALERT_ACTION_H_
-#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_ACTION_H_
+#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_ACTION_H_
+#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_ACTION_H_
 
 #import <UIKit/UIKit.h>
 
@@ -32,4 +32,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_ACTION_H_
+#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_ACTION_H_

ios/chrome/browser/ui/alert_view_controller/alert_action.mm → ios/chrome/browser/ui/alert_view/alert_action.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/alert_view_controller/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/alert_view_controller/alert_consumer.h → ios/chrome/browser/ui/alert_view/alert_consumer.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_ALERT_VIEW_CONTROLLER_ALERT_CONSUMER_H_
-#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_CONSUMER_H_
+#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_CONSUMER_H_
+#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_CONSUMER_H_
 
 #import <Foundation/Foundation.h>
 
@@ -32,4 +32,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_CONSUMER_H_
+#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_CONSUMER_H_

ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h → ios/chrome/browser/ui/alert_view/alert_view_controller.h

@@ -2,12 +2,12 @@
 // 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_ALERT_VIEW_CONTROLLER_ALERT_VIEW_CONTROLLER_H_
-#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_VIEW_CONTROLLER_H_
+#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_VIEW_CONTROLLER_H_
+#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_VIEW_CONTROLLER_H_
 
 #import <UIKit/UIKit.h>
 
-#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_consumer.h"
 
 // This class is a replacement for UIAlertController that supports custom
 // presentation styles, i.e. change modalPresentationStyle,
@@ -21,4 +21,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_ALERT_VIEW_CONTROLLER_H_
+#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_ALERT_VIEW_CONTROLLER_H_

ios/chrome/browser/ui/alert_view_controller/alert_view_controller.mm → ios/chrome/browser/ui/alert_view/alert_view_controller.mm

@@ -2,10 +2,10 @@
 // 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/alert_view_controller/alert_view_controller.h"
+#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h"
 
 #include "base/logging.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
 #import "ios/chrome/browser/ui/elements/gray_highlight_button.h"
 #import "ios/chrome/browser/ui/elements/text_field_configuration.h"
 #import "ios/chrome/browser/ui/util/uikit_ui_util.h"

ios/chrome/browser/ui/alert_view_controller/alert_view_controller_unittest.mm → ios/chrome/browser/ui/alert_view/alert_view_controller_unittest.mm

@@ -2,9 +2,9 @@
 // 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/alert_view_controller/alert_view_controller.h"
+#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h"
 
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
 #include "testing/platform_test.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/alert_view_controller/test/BUILD.gn → ios/chrome/browser/ui/alert_view/test/BUILD.gn

@@ -13,7 +13,7 @@ source_set("test") {
 
   deps = [
     "//base",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//testing/gtest",
   ]
 }

ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h → ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h

@@ -2,10 +2,10 @@
 // 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_ALERT_VIEW_CONTROLLER_TEST_FAKE_ALERT_CONSUMER_H_
-#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_TEST_FAKE_ALERT_CONSUMER_H_
+#ifndef IOS_CHROME_BROWSER_UI_ALERT_VIEW_TEST_FAKE_ALERT_CONSUMER_H_
+#define IOS_CHROME_BROWSER_UI_ALERT_VIEW_TEST_FAKE_ALERT_CONSUMER_H_
 
-#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_consumer.h"
 
 // Fake version of AlertConsumer that allows read access to consumed values.
 @interface FakeAlertConsumer : NSObject <AlertConsumer>
@@ -19,4 +19,4 @@
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_CONTROLLER_TEST_FAKE_ALERT_CONSUMER_H_
+#endif  // IOS_CHROME_BROWSER_UI_ALERT_VIEW_TEST_FAKE_ALERT_CONSUMER_H_

ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.mm → ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.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/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."

ios/chrome/browser/ui/overlays/common/alerts/BUILD.gn

@@ -16,7 +16,7 @@ source_set("alerts") {
 
   deps = [
     "//base",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/presenters",
@@ -33,8 +33,8 @@ source_set("unit_tests") {
 
   deps = [
     ":alerts",
-    "//ios/chrome/browser/ui/alert_view_controller",
-    "//ios/chrome/browser/ui/alert_view_controller/test",
+    "//ios/chrome/browser/ui/alert_view",
+    "//ios/chrome/browser/ui/alert_view/test",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays/common/alerts/test",
     "//ios/chrome/browser/ui/overlays/test",

ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator.mm

@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator.h"
 
 #include "base/logging.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h"
+#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator+subclassing.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h"
 #import "ios/chrome/browser/ui/overlays/overlay_request_coordinator_delegate.h"

ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.mm

@@ -5,7 +5,7 @@
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h"
 
 #include "base/logging.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_consumer.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator_unittest.mm

@@ -4,8 +4,8 @@
 
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h"
 
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 #import "ios/chrome/browser/ui/elements/text_field_configuration.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"

ios/chrome/browser/ui/overlays/common/alerts/test/BUILD.gn

@@ -12,8 +12,8 @@ source_set("test") {
   configs += [ "//build/config/compiler:enable_arc" ]
 
   deps = [
-    "//ios/chrome/browser/ui/alert_view_controller",
-    "//ios/chrome/browser/ui/alert_view_controller/test",
+    "//ios/chrome/browser/ui/alert_view",
+    "//ios/chrome/browser/ui/alert_view/test",
     "//ios/chrome/browser/ui/overlays/common/alerts",
     "//ios/chrome/browser/ui/overlays/test",
     "//testing/gtest",

ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.mm

@@ -4,7 +4,7 @@
 
 #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"
 
-#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)

ios/chrome/browser/ui/overlays/web_content_area/app_launcher/BUILD.gn

@@ -19,7 +19,7 @@ source_set("app_launcher") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/common/alerts",
     "//ui/base",
@@ -43,8 +43,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/alert_view_controller",
-    "//ios/chrome/browser/ui/alert_view_controller/test",
+    "//ios/chrome/browser/ui/alert_view",
+    "//ios/chrome/browser/ui/alert_view/test",
     "//ios/chrome/browser/ui/dialogs",
     "//ios/chrome/browser/ui/overlays/common/alerts/test",
     "//ios/chrome/browser/ui/overlays/test",

ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator.mm

@@ -9,7 +9,7 @@
 #include "ios/chrome/browser/overlays/public/overlay_request.h"
 #include "ios/chrome/browser/overlays/public/overlay_response.h"
 #include "ios/chrome/browser/overlays/public/web_content_area/app_launcher_alert_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ui/base/l10n/l10n_util.h"

ios/chrome/browser/ui/overlays/web_content_area/app_launcher/app_launcher_alert_overlay_mediator_unittest.mm

@@ -8,8 +8,8 @@
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/app_launcher_alert_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "testing/gtest_mac.h"

ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/BUILD.gn

@@ -19,7 +19,7 @@ source_set("http_auth_dialogs") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays:coordinators",
     "//ios/chrome/browser/ui/overlays/common/alerts",
@@ -44,8 +44,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/alert_view_controller",
-    "//ios/chrome/browser/ui/alert_view_controller/test",
+    "//ios/chrome/browser/ui/alert_view",
+    "//ios/chrome/browser/ui/alert_view/test",
     "//ios/chrome/browser/ui/dialogs",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays/common/alerts/test",

ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_coordinator.mm

@@ -6,7 +6,7 @@
 
 #include "ios/chrome/browser/overlays/public/overlay_request.h"
 #include "ios/chrome/browser/overlays/public/web_content_area/http_auth_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h"
+#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_coordinator+subclassing.h"
 #import "ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator.h"
 

ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator.mm

@@ -10,8 +10,8 @@
 #include "ios/chrome/browser/overlays/public/overlay_request.h"
 #include "ios/chrome/browser/overlays/public/overlay_response.h"
 #include "ios/chrome/browser/overlays/public/web_content_area/http_auth_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_consumer.h"
 #import "ios/chrome/browser/ui/elements/text_field_configuration.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h"
 #include "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/overlays/web_content_area/http_auth_dialogs/http_auth_dialog_overlay_mediator_unittest.mm

@@ -10,8 +10,8 @@
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/http_auth_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h"
 #import "ios/chrome/browser/ui/elements/text_field_configuration.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/BUILD.gn

@@ -19,7 +19,7 @@ source_set("common") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/dialogs",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays:coordinators",
@@ -45,7 +45,7 @@ source_set("alerts") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/dialogs:constants",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays:coordinators",
@@ -71,7 +71,7 @@ source_set("confirmations") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/dialogs:constants",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays:coordinators",
@@ -97,7 +97,7 @@ source_set("prompts") {
     "//ios/chrome/app/strings:ios_strings_grit",
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/dialogs:constants",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/overlays:coordinators",
@@ -128,8 +128,8 @@ source_set("unit_tests") {
     "//ios/chrome/browser/overlays",
     "//ios/chrome/browser/overlays/public/web_content_area",
     "//ios/chrome/browser/overlays/test",
-    "//ios/chrome/browser/ui/alert_view_controller",
-    "//ios/chrome/browser/ui/alert_view_controller/test",
+    "//ios/chrome/browser/ui/alert_view",
+    "//ios/chrome/browser/ui/alert_view/test",
     "//ios/chrome/browser/ui/dialogs",
     "//ios/chrome/browser/ui/dialogs:constants",
     "//ios/chrome/browser/ui/elements",

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_coordinator_unittest.mm

@@ -7,7 +7,7 @@
 #import "base/test/ios/wait_util.h"
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/java_script_alert_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h"
+#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h"
 #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/test/java_script_dialog_overlay_coordinator_test.h"
 #import "ios/web/public/test/fakes/test_web_state.h"
 

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator.mm

@@ -8,8 +8,8 @@
 #include "components/strings/grit/components_strings.h"
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/java_script_alert_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_consumer.h"
 #import "ios/chrome/browser/ui/dialogs/dialog_constants.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h"
 #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h"

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_alert_overlay_mediator_unittest.mm

@@ -9,8 +9,8 @@
 #include "components/url_formatter/elide_url.h"
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/java_script_alert_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"
 #include "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator.mm

@@ -8,8 +8,8 @@
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/java_script_confirmation_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_consumer.h"
 #import "ios/chrome/browser/ui/dialogs/dialog_constants.h"
 #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h"
 #import "ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_overlay_mediator_util.h"

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_confirmation_overlay_mediator_unittest.mm

@@ -10,8 +10,8 @@
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/java_script_confirmation_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/test/alert_overlay_mediator_test.h"
 #include "ios/chrome/grit/ios_strings.h"

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_dialog_blocking_action.h

@@ -5,7 +5,7 @@
 #ifndef IOS_CHROME_BROWSER_UI_OVERLAYS_WEB_CONTENT_AREA_JAVA_SCRIPT_DIALOGS_JAVA_SCRIPT_DIALOG_BLOCKING_ACTION_H_
 #define IOS_CHROME_BROWSER_UI_OVERLAYS_WEB_CONTENT_AREA_JAVA_SCRIPT_DIALOGS_JAVA_SCRIPT_DIALOG_BLOCKING_ACTION_H_
 
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
 
 @class AlertOverlayMediator;
 class JavaScriptDialogSource;

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator.mm

@@ -9,8 +9,8 @@
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/java_script_prompt_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h"
 #import "ios/chrome/browser/ui/dialogs/dialog_constants.h"
 #import "ios/chrome/browser/ui/elements/text_field_configuration.h"
 #import "ios/chrome/browser/ui/overlays/common/alerts/alert_overlay_mediator+subclassing.h"

ios/chrome/browser/ui/overlays/web_content_area/java_script_dialogs/java_script_prompt_overlay_mediator_unittest.mm

@@ -10,8 +10,8 @@
 #import "ios/chrome/browser/overlays/public/overlay_request.h"
 #import "ios/chrome/browser/overlays/public/overlay_response.h"
 #import "ios/chrome/browser/overlays/public/web_content_area/java_script_prompt_overlay.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/test/fake_alert_consumer.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/test/fake_alert_consumer.h"
 #import "ios/chrome/browser/ui/dialogs/dialog_constants.h"
 #import "ios/chrome/browser/ui/dialogs/java_script_dialog_blocking_state.h"
 #import "ios/chrome/browser/ui/elements/text_field_configuration.h"

ios/chrome/test/BUILD.gn

@@ -205,7 +205,7 @@ test("ios_chrome_unittests") {
     "//ios/chrome/browser/u2f:unit_tests",
     "//ios/chrome/browser/ui/activity_services:unit_tests",
     "//ios/chrome/browser/ui/alert_coordinator:unit_tests",
-    "//ios/chrome/browser/ui/alert_view_controller:unit_tests",
+    "//ios/chrome/browser/ui/alert_view:unit_tests",
     "//ios/chrome/browser/ui/app_launcher:unit_tests",
     "//ios/chrome/browser/ui/authentication:unit_tests",
     "//ios/chrome/browser/ui/authentication/cells:unit_tests",

ios/showcase/alert/BUILD.gn

@@ -8,7 +8,7 @@ source_set("alert") {
     "sc_alert_coordinator.mm",
   ]
   deps = [
-    "//ios/chrome/browser/ui/alert_view_controller",
+    "//ios/chrome/browser/ui/alert_view",
     "//ios/chrome/browser/ui/elements",
     "//ios/chrome/browser/ui/presenters",
     "//ios/showcase/common",

ios/showcase/alert/sc_alert_coordinator.mm

@@ -4,8 +4,8 @@
 
 #import "ios/showcase/alert/sc_alert_coordinator.h"
 
-#import "ios/chrome/browser/ui/alert_view_controller/alert_action.h"
-#import "ios/chrome/browser/ui/alert_view_controller/alert_view_controller.h"
+#import "ios/chrome/browser/ui/alert_view/alert_action.h"
+#import "ios/chrome/browser/ui/alert_view/alert_view_controller.h"
 #import "ios/chrome/browser/ui/elements/text_field_configuration.h"
 #import "ios/chrome/browser/ui/presenters/non_modal_view_controller_presenter.h"