[iOS] Adding kGoogleServicesSettingsViewIdentifier

Adding kGoogleServicesSettingsViewIdentifier const variable for EarlGrey
tests.

Change-Id: Iea324479412bd7d5b3fbaf2df4dd5f7a719e616f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1836504
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703651}

ios/chrome/browser/metrics/BUILD.gn

@@ -240,6 +240,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/authentication/cells",
     "//ios/chrome/browser/ui/popup_menu:constants",
     "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/toolbar/buttons",
     "//ios/chrome/browser/ui/toolbar/public",
     "//ios/chrome/browser/ui/util",

ios/chrome/browser/metrics/ukm_egtest.mm

@@ -18,6 +18,7 @@
 #import "ios/chrome/browser/ui/authentication/cells/signin_promo_view.h"
 #import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui.h"
 #import "ios/chrome/browser/ui/authentication/signin_earlgrey_utils.h"
+#import "ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
 #include "ios/chrome/grit/ios_strings.h"
 #import "ios/chrome/test/app/chrome_test_util.h"
@@ -343,7 +344,7 @@ void SignOut() {
                                      YES)]
            usingSearchAction:grey_scrollInDirection(kGREYDirectionDown, 200)
         onElementWithMatcher:grey_accessibilityID(
-                                 @"google_services_settings_view_controller")]
+                                 kGoogleServicesSettingsViewIdentifier)]
         performAction:chrome_test_util::TurnSettingsSwitchOn(NO)];
 
   } else {

ios/chrome/browser/ui/settings/google_services/google_services_settings_egtest.mm

@@ -11,6 +11,7 @@
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui.h"
 #import "ios/chrome/browser/ui/authentication/signin_earlgrey_utils.h"
+#import "ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.h"
 #import "ios/chrome/browser/ui/settings/google_services/manage_sync_settings_table_view_controller.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
 #include "ios/chrome/grit/ios_chromium_strings.h"
@@ -137,7 +138,7 @@ TabModel* GetNormalTabModel() {
   [ChromeEarlGreyUI openSettingsMenu];
   [ChromeEarlGreyUI tapSettingsMenuButton:GoogleServicesSettingsButton()];
   self.scrollViewMatcher =
-      grey_accessibilityID(@"google_services_settings_view_controller");
+      grey_accessibilityID(kGoogleServicesSettingsViewIdentifier);
   [[EarlGrey selectElementWithMatcher:self.scrollViewMatcher]
       assertWithMatcher:grey_notNil()];
 }

ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.h

@@ -13,6 +13,8 @@
 @protocol GoogleServicesSettingsServiceDelegate;
 @protocol GoogleServicesSettingsViewControllerModelDelegate;
 
+extern NSString* const kGoogleServicesSettingsViewIdentifier;
+
 // Delegate for presentation events related to
 // GoogleServicesSettingsViewController.
 @protocol GoogleServicesSettingsViewControllerPresentationDelegate <NSObject>

ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.mm

@@ -16,12 +16,16 @@
 #error "This file requires ARC support."
 #endif
 
+// Accessibility identifier for the Google services settings table view.
+NSString* const kGoogleServicesSettingsViewIdentifier =
+    @"google_services_settings_view_controller";
+
 @implementation GoogleServicesSettingsViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.tableView.accessibilityIdentifier =
-      @"google_services_settings_view_controller";
+      kGoogleServicesSettingsViewIdentifier;
   self.title = l10n_util::GetNSString(IDS_IOS_GOOGLE_SERVICES_SETTINGS_TITLE);
 }
 

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

@@ -69,6 +69,7 @@ source_set("eg_tests") {
     "//ios/chrome/browser/ui/content_suggestions:content_suggestions_constant",
     "//ios/chrome/browser/ui/recent_tabs:recent_tabs_ui_constants",
     "//ios/chrome/browser/ui/settings",
+    "//ios/chrome/browser/ui/settings/google_services",
     "//ios/chrome/browser/ui/table_view/cells",
     "//ios/chrome/browser/ui/util",
     "//ios/chrome/browser/web_state_list",

ios/chrome/browser/ui/signin_interaction/signin_interaction_controller_egtest.mm

@@ -21,6 +21,7 @@
 #import "ios/chrome/browser/ui/commands/open_new_tab_command.h"
 #import "ios/chrome/browser/ui/content_suggestions/ntp_home_constant.h"
 #import "ios/chrome/browser/ui/recent_tabs/recent_tabs_constants.h"
+#import "ios/chrome/browser/ui/settings/google_services/google_services_settings_view_controller.h"
 #import "ios/chrome/browser/ui/signin_interaction/signin_interaction_controller_egtest_util.h"
 #include "ios/chrome/browser/ui/util/ui_util.h"
 #import "ios/chrome/browser/web_state_list/web_state_list.h"
@@ -385,7 +386,7 @@ void RemoveBrowsingData() {
 
   [[EarlGrey
       selectElementWithMatcher:grey_accessibilityID(
-                                   @"google_services_settings_view_controller")]
+                                   kGoogleServicesSettingsViewIdentifier)]
       performAction:grey_swipeFastInDirection(kGREYDirectionDown)];
   [[EarlGrey
       selectElementWithMatcher: