[ios] Mark TranslateInfobarCoordinator as Legacy

With Translate moving to Messages, it will have a similarly named
TranslateInfobarCoordinator that will replace TranslateInfobarController.
Move the current TranslateInfobarCoordinator to LegacyTranslateInforbarCoordinator
since it won't be used in the new Messages logic.

Bug: 1014959
Change-Id: I6d5fb835cd0c826db1ffa7bac9fd48338c6ec894
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1864399Reviewed-by: Mark Cogan <marq@chromium.org>
Commit-Queue: Chris Lu <thegreenfrog@chromium.org>
Cr-Commit-Position: refs/heads/master@{#707425}

ios/chrome/browser/translate/BUILD.gn

@@ -108,7 +108,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
     "//ios/chrome/browser/ui/popup_menu:constants",
-    "//ios/chrome/browser/ui/translate",
+    "//ios/chrome/browser/ui/translate:legacy_translate",
     "//ios/chrome/browser/ui/translate:translate_ui",
     "//ios/chrome/browser/ui/util:util",
     "//ios/chrome/test/app:test_support",

ios/chrome/browser/translate/translate_egtest.mm

@@ -29,7 +29,7 @@
 #import "ios/chrome/browser/chrome_url_util.h"
 #include "ios/chrome/browser/translate/chrome_ios_translate_client.h"
 #import "ios/chrome/browser/ui/popup_menu/popup_menu_constants.h"
-#import "ios/chrome/browser/ui/translate/translate_infobar_coordinator.h"
+#import "ios/chrome/browser/ui/translate/legacy_translate_infobar_coordinator.h"
 #import "ios/chrome/browser/ui/translate/translate_infobar_view.h"
 #import "ios/chrome/browser/ui/util/ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"

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

@@ -149,7 +149,7 @@ source_set("browser_view") {
     "//ios/chrome/browser/ui/toolbar/public:feature_flags",
     "//ios/chrome/browser/ui/toolbar_container",
     "//ios/chrome/browser/ui/toolbar_container:feature_flags",
-    "//ios/chrome/browser/ui/translate",
+    "//ios/chrome/browser/ui/translate:legacy_translate",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/ui/voice",
     "//ios/chrome/browser/upgrade",

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

@@ -42,7 +42,7 @@
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_coordinator.h"
 #import "ios/chrome/browser/ui/settings/autofill/autofill_add_credit_card_coordinator.h"
 #import "ios/chrome/browser/ui/snackbar/snackbar_coordinator.h"
-#import "ios/chrome/browser/ui/translate/translate_infobar_coordinator.h"
+#import "ios/chrome/browser/ui/translate/legacy_translate_infobar_coordinator.h"
 #import "ios/chrome/browser/url_loading/url_loading_params.h"
 #import "ios/chrome/browser/url_loading/url_loading_service.h"
 #import "ios/chrome/browser/url_loading/url_loading_service_factory.h"
@@ -144,7 +144,7 @@
 // Coordinator for the translate infobar's language selection and translate
 // option popup menus.
 @property(nonatomic, strong)
-    TranslateInfobarCoordinator* translateInfobarCoordinator;
+    LegacyTranslateInfobarCoordinator* translateInfobarCoordinator;
 
 @end
 
@@ -300,7 +300,7 @@
   self.formInputAccessoryCoordinator.navigator = self;
   [self.formInputAccessoryCoordinator start];
 
-  self.translateInfobarCoordinator = [[TranslateInfobarCoordinator alloc]
+  self.translateInfobarCoordinator = [[LegacyTranslateInfobarCoordinator alloc]
       initWithBaseViewController:self.viewController
                     browserState:self.browserState
                     webStateList:self.tabModel.webStateList

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

@@ -69,7 +69,7 @@ source_set("main") {
     "//ios/chrome/browser/ui/reading_list",
     "//ios/chrome/browser/ui/recent_tabs",
     "//ios/chrome/browser/ui/snackbar",
-    "//ios/chrome/browser/ui/translate",
+    "//ios/chrome/browser/ui/translate:legacy_translate",
     "//ios/chrome/browser/url_loading",
     "//ios/chrome/browser/web",
     "//ios/chrome/browser/web:tab_helper_delegates",

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

@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-source_set("translate") {
+source_set("legacy_translate") {
   configs += [ "//build/config/compiler:enable_arc" ]
   sources = [
-    "translate_infobar_coordinator.h",
-    "translate_infobar_coordinator.mm",
-    "translate_infobar_mediator.h",
-    "translate_infobar_mediator.mm",
+    "legacy_translate_infobar_coordinator.h",
+    "legacy_translate_infobar_coordinator.mm",
+    "legacy_translate_infobar_mediator.h",
+    "legacy_translate_infobar_mediator.mm",
   ]
   deps = [
     ":translate_ui",
@@ -77,7 +77,7 @@ source_set("unit_tests") {
     "translate_infobar_mediator_unittest.mm",
   ]
   deps = [
-    ":translate",
+    ":legacy_translate",
     "//components/language/ios/browser",
     "//components/translate/core/browser:test_support",
     "//ios/chrome/browser/browser_state:test_support",

ios/chrome/browser/ui/translate/translate_infobar_coordinator.h → ios/chrome/browser/ui/translate/legacy_translate_infobar_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_TRANSLATE_TRANSLATE_INFOBAR_COORDINATOR_H_
-#define IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_COORDINATOR_H_
+#ifndef IOS_CHROME_BROWSER_UI_TRANSLATE_LEGACY_TRANSLATE_INFOBAR_COORDINATOR_H_
+#define IOS_CHROME_BROWSER_UI_TRANSLATE_LEGACY_TRANSLATE_INFOBAR_COORDINATOR_H_
 
 #import <UIKit/UIKit.h>
 
@@ -20,7 +20,7 @@ class WebStateList;
 // Coordinator responsible for presenting and dismissing the translate infobar's
 // language selection popup menu, translate options popup menu, and translate
 // options notifications.
-@interface TranslateInfobarCoordinator : ChromeCoordinator
+@interface LegacyTranslateInfobarCoordinator : ChromeCoordinator
 
 // Creates a coordinator that uses |viewController|, |browserState|, and
 // |webStateList|.
@@ -38,4 +38,4 @@ class WebStateList;
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_COORDINATOR_H_
+#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_LEGACY_TRANSLATE_INFOBAR_COORDINATOR_H_

ios/chrome/browser/ui/translate/translate_infobar_coordinator.mm → ios/chrome/browser/ui/translate/legacy_translate_infobar_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/translate/translate_infobar_coordinator.h"
+#import "ios/chrome/browser/ui/translate/legacy_translate_infobar_coordinator.h"
 
 #include "base/logging.h"
 #include "base/mac/foundation_util.h"
@@ -19,7 +19,7 @@
 #import "ios/chrome/browser/ui/popup_menu/public/popup_menu_table_view_controller_delegate.h"
 #import "ios/chrome/browser/ui/popup_menu/public/popup_menu_ui_constants.h"
 #import "ios/chrome/browser/ui/translate/cells/select_language_popup_menu_item.h"
-#import "ios/chrome/browser/ui/translate/translate_infobar_mediator.h"
+#import "ios/chrome/browser/ui/translate/legacy_translate_infobar_mediator.h"
 #import "ios/chrome/browser/ui/translate/translate_notification_presenter.h"
 #import "ios/chrome/browser/ui/util/layout_guide_names.h"
 
@@ -30,17 +30,18 @@
 NSString* const kLanguageSelectorPopupMenuId = @"kLanguageSelectorPopupMenuId";
 NSString* const kTranslateOptionsPopupMenuId = @"kTranslateOptionsPopupMenuId";
 
-@interface TranslateInfobarCoordinator () <LanguageSelectionHandler,
-                                           PopupMenuPresenterDelegate,
-                                           PopupMenuTableViewControllerDelegate,
-                                           TranslateOptionSelectionHandler>
+@interface LegacyTranslateInfobarCoordinator () <
+    LanguageSelectionHandler,
+    PopupMenuPresenterDelegate,
+    PopupMenuTableViewControllerDelegate,
+    TranslateOptionSelectionHandler>
 
 // The WebStateList this coordinator observes.
 @property(nonatomic, assign) WebStateList* webStateList;
 // Presenter for the popup menu, managing the animations.
 @property(nonatomic, strong) PopupMenuPresenter* popupMenuPresenter;
 // Mediator for the popup menu.
-@property(nonatomic, strong) TranslateInfobarMediator* mediator;
+@property(nonatomic, strong) LegacyTranslateInfobarMediator* mediator;
 // Presenter for the translate notifications.
 @property(nonatomic, strong)
     TranslateNotificationPresenter* notificationPresenter;
@@ -59,7 +60,7 @@ NSString* const kTranslateOptionsPopupMenuId = @"kTranslateOptionsPopupMenuId";
 
 @end
 
-@implementation TranslateInfobarCoordinator
+@implementation LegacyTranslateInfobarCoordinator
 
 - (instancetype)initWithBaseViewController:(UIViewController*)viewController
                               browserState:
@@ -85,7 +86,7 @@ NSString* const kTranslateOptionsPopupMenuId = @"kTranslateOptionsPopupMenuId";
   self.notificationPresenter = [[TranslateNotificationPresenter alloc]
       initWithDispatcher:self.dispatcher];
 
-  self.mediator = [[TranslateInfobarMediator alloc]
+  self.mediator = [[LegacyTranslateInfobarMediator alloc]
       initWithSelectionHandler:self
            notificationHandler:self.notificationPresenter];
   self.mediator.webStateList = self.webStateList;

ios/chrome/browser/ui/translate/translate_infobar_mediator.h → ios/chrome/browser/ui/translate/legacy_translate_infobar_mediator.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_TRANSLATE_TRANSLATE_INFOBAR_MEDIATOR_H_
-#define IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_MEDIATOR_H_
+#ifndef IOS_CHROME_BROWSER_UI_TRANSLATE_LEGACY_TRANSLATE_INFOBAR_MEDIATOR_H_
+#define IOS_CHROME_BROWSER_UI_TRANSLATE_LEGACY_TRANSLATE_INFOBAR_MEDIATOR_H_
 
 #import <Foundation/Foundation.h>
 
@@ -28,7 +28,7 @@ typedef NS_ENUM(NSInteger, TranslatePopupMenuType) {
 // the translate infobar's language selection popup menu as well as translate
 // options popup menus. Also installs the UI handler for the translate options
 // notfications.
-@interface TranslateInfobarMediator : NSObject
+@interface LegacyTranslateInfobarMediator : NSObject
 
 // |selectionHandler| presents and dismisses the language selection UI as well
 // as the translate option selection UI. |notificationHandler| presents and
@@ -65,4 +65,4 @@ typedef NS_ENUM(NSInteger, TranslatePopupMenuType) {
 
 @end
 
-#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_TRANSLATE_INFOBAR_MEDIATOR_H_
+#endif  // IOS_CHROME_BROWSER_UI_TRANSLATE_LEGACY_TRANSLATE_INFOBAR_MEDIATOR_H_

ios/chrome/browser/ui/translate/translate_infobar_mediator.mm → ios/chrome/browser/ui/translate/legacy_translate_infobar_mediator.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/translate/translate_infobar_mediator.h"
+#import "ios/chrome/browser/ui/translate/legacy_translate_infobar_mediator.h"
 
 #include <memory>
 
@@ -28,7 +28,7 @@
 #error "This file requires ARC support."
 #endif
 
-@interface TranslateInfobarMediator () <WebStateListObserving> {
+@interface LegacyTranslateInfobarMediator () <WebStateListObserving> {
   // WebStateList observers.
   std::unique_ptr<WebStateListObserverBridge> _webStateListObserverBridge;
   std::unique_ptr<ScopedObserver<WebStateList, WebStateListObserver>>
@@ -46,7 +46,7 @@
 
 @end
 
-@implementation TranslateInfobarMediator
+@implementation LegacyTranslateInfobarMediator
 
 - (instancetype)
     initWithSelectionHandler:

ios/chrome/browser/ui/translate/translate_infobar_mediator_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/chrome/browser/ui/translate/translate_infobar_mediator.h"
+#import "ios/chrome/browser/ui/translate/legacy_translate_infobar_mediator.h"
 
 #include <memory>
 
@@ -81,7 +81,7 @@ class TranslateInfobarMediatorTest : public PlatformTest {
             niceMockForProtocol:@protocol(TestSelectionHandlerProtocol)]),
         notification_handler_([OCMockObject
             niceMockForProtocol:@protocol(TranslateNotificationHandler)]),
-        mediator_([[TranslateInfobarMediator alloc]
+        mediator_([[LegacyTranslateInfobarMediator alloc]
             initWithSelectionHandler:selection_handler_
                  notificationHandler:notification_handler_]) {
     CreateTranslateClient();
@@ -95,7 +95,7 @@ class TranslateInfobarMediatorTest : public PlatformTest {
 
   id notification_handler() { return notification_handler_; }
 
-  TranslateInfobarMediator* mediator() { return mediator_; }
+  LegacyTranslateInfobarMediator* mediator() { return mediator_; }
 
   void CreateTranslateClient() {
     auto web_state = std::make_unique<web::TestWebState>();
@@ -145,7 +145,7 @@ class TranslateInfobarMediatorTest : public PlatformTest {
   MockTranslateInfoBarDelegateFactory delegate_factory_;
   id selection_handler_;
   id notification_handler_;
-  TranslateInfobarMediator* mediator_;
+  LegacyTranslateInfobarMediator* mediator_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateInfobarMediatorTest);
 };
@@ -160,7 +160,7 @@ TEST_F(TranslateInfobarMediatorTest, InstallHandlers) {
   EXPECT_EQ(nil, translate_client->translate_option_selection_handler());
   EXPECT_EQ(nil, translate_client->translate_notification_handler());
 
-  TranslateInfobarMediator* translate_infobar_mediator = mediator();
+  LegacyTranslateInfobarMediator* translate_infobar_mediator = mediator();
   translate_infobar_mediator.webStateList = web_state_list();
 
   EXPECT_EQ(selection_handler(),
@@ -191,7 +191,7 @@ TEST_F(TranslateInfobarMediatorTest, TranslateOptionMenuItems) {
   EXPECT_CALL(*GetDelegate(), ShouldAlwaysTranslate())
       .WillOnce(testing::Return(true));
 
-  TranslateInfobarMediator* translate_infobar_mediator = mediator();
+  LegacyTranslateInfobarMediator* translate_infobar_mediator = mediator();
   translate_infobar_mediator.type =
       TranslatePopupMenuTypeTranslateOptionSelection;
   translate_infobar_mediator.infobarDelegate = GetDelegate();
@@ -243,7 +243,7 @@ TEST_F(TranslateInfobarMediatorTest, LanguageSelectionMenuItems) {
   EXPECT_CALL(*GetDelegate(), language_name_at(2))
       .WillOnce(testing::Return(base::UTF8ToUTF16("French")));
 
-  TranslateInfobarMediator* translate_infobar_mediator = mediator();
+  LegacyTranslateInfobarMediator* translate_infobar_mediator = mediator();
   translate_infobar_mediator.type = TranslatePopupMenuTypeLanguageSelection;
   translate_infobar_mediator.infobarDelegate = GetDelegate();
   translate_infobar_mediator.unavailableLanguageIndex = 1;