[ios] Remove the unused ios_automatically_manage_certs flag.

Bug: 994873
Change-Id: I814dbb66c22efda67c31f0827c3f1f251ae263bc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1394435
Reviewed-by: Rohit Rao <rohitrao@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Auto-Submit: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#687924}

build/config/ios/ios_sdk.gni

@@ -33,12 +33,6 @@ declare_args() {
   # provisioning for the selected code signing identify support that prefix.
   ios_app_bundle_id_prefix = "org.chromium"
 
-  # If true, then allow using Xcode to automatically manage certificates. This
-  # requires loading a separate Xcode project and enable automatically managed
-  # certificates. When true, all test application will use the same bundle id
-  # to avoid running out of certificates if using a free account.
-  ios_automatically_manage_certs = false
-
   # If non-empty, this list must contain valid cpu architecture, and the final
   # build will be a multi-architecture build (aka fat build) supporting the
   # main $target_cpu architecture and all of $additional_target_cpus.
@@ -65,8 +59,6 @@ assert(custom_toolchain == "" || additional_target_cpus == [],
 
 use_ios_simulator = current_cpu == "x86" || current_cpu == "x64"
 
-ios_generic_test_bundle_id_suffix = "generic-unit-test"
-
 # Initialize additional_toolchains from additional_target_cpus. Assert here
 # that the list does not contains $target_cpu nor duplicates as this would
 # cause weird errors during the build.

build/config/ios/rules.gni

@@ -1690,18 +1690,10 @@ template("ios_xctest_bundle") {
         # Fall back to a reasonable default value.
         _principal_class = "NSObject"
       }
-      extra_substitutions =
-          [ "XCTEST_BUNDLE_PRINCIPAL_CLASS=${_principal_class}" ]
-
-      if (ios_automatically_manage_certs) {
-        # Use a fixed bundle identifier for EarlGrey tests when using Xcode to
-        # manage the certificates as the number of free certs is limited.
-        extra_substitutions += [
-          "MODULE_BUNDLE_ID=gtest.${ios_generic_test_bundle_id_suffix}-module",
-        ]
-      } else {
-        extra_substitutions += [ "MODULE_BUNDLE_ID=gtest.$_output_name" ]
-      }
+      extra_substitutions = [
+        "XCTEST_BUNDLE_PRINCIPAL_CLASS=${_principal_class}",
+        "MODULE_BUNDLE_ID=gtest.$_output_name",
+      ]
     }
 
     bundle_data(_info_plist_bundle) {
@@ -1845,15 +1837,6 @@ template("ios_xctest_test") {
 
     if (!defined(invoker.info_plist) && !defined(invoker.info_plist_target)) {
       info_plist = "//build/config/ios/Host-Info.plist"
-      if (ios_automatically_manage_certs) {
-        # Use the same bundle identifier for EarlGrey tests as for unit tests
-        # when managing certificates as the number of free certs is limited.
-        if (!defined(extra_substitutions)) {
-          extra_substitutions = []
-        }
-        extra_substitutions +=
-            [ "EXECUTABLE_NAME=gtest.${ios_generic_test_bundle_id_suffix}" ]
-      }
     }
 
     # Xcode needs the following frameworks installed in the application (and
@@ -1958,13 +1941,6 @@ template("ios_xcuitest_test_runner_bundle") {
 
     executable_name = _output_name
     info_plist_target = ":$_info_plist_merge_plist"
-
-    if (ios_automatically_manage_certs) {
-      # Use the same bundle identifier for XCUITest tests as for unit tests
-      # when managing certificates as the number of free certs is limited.
-      extra_substitutions =
-          [ "EXECUTABLE_NAME=gtest.${ios_generic_test_bundle_id_suffix}" ]
-    }
   }
 
   bundle_data(_info_plist_bundle) {

docs/ios/build_instructions.md

@@ -154,17 +154,7 @@ to send commands to Chromium.
 
 ### Mobile provisioning profiles for tests
 
-In addition to that, you need provisioning profiles for the individual test
-suites that you want to run. Their bundle identifier depends on whether the
-gn variable `ios_automatically_manage_certs` is set to true (the default)
-or false.
-
-If set to true, then you just need a provisioning profile for the bundle
-identifier `${prefix}.gtest.generic-unit-test` but you can only have a
-single test application installed on the device (all the test application
-will share the same bundle identifier).
-
-If set to false, then you need a different provisioning profile for each
+In addition to that, you need a different provisioning profile for each
 test application. Those provisioning profile will have a bundle identifier
 matching the following pattern `${prefix}.gtest.${test-suite-name}` where
 `${test-suite-name}` is the name of the test suite with underscores changed
@@ -178,10 +168,8 @@ profiles for EarlGrey and OCHamcrest frameworks:
 -   `${prefix}.test.EarlGrey`
 
 In addition to that, then you'll need one additional provisioning profile for
-the XCTest module too. This module bundle identifier depends on whether the
-gn variable `ios_automatically_manage_certs` is set to true or false. If set
-to true, then `${prefix}.gtest.generic-unit-test-module` will be used, otherwise
-it will match the pattern: `${prefix}.gtest.${test-suite-name}-module`.
+the XCTest module too. It must match the pattern:
+`${prefix}.gtest.${test-suite-name}-module`.
 
 ### Other applications
 

ios/chrome/test/earl_grey/chrome_ios_eg_test.gni

@@ -2,8 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/mac/tweak_info_plist.gni")
 import("//build/config/ios/ios_sdk.gni")
+import("//build/mac/tweak_info_plist.gni")
 import("//ios/build/chrome_build.gni")
 import("//ios/public/provider/chrome/browser/build_config.gni")
 import("//ios/third_party/earl_grey/ios_eg_test.gni")
@@ -158,15 +158,8 @@ template("chrome_ios_eg_test") {
       "EG_MAIN_APPLICATION_DELEGATE=$_eg_main_application_delegate",
       "SSOAUTH_URL_SCHEME=$url_ssoauth_scheme",
       "CONTENT_WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.ContentTodayExtension",
+      "CHROMIUM_BUNDLE_ID=gtest.$target_name",
     ]
-    if (ios_automatically_manage_certs) {
-      # Use the same bundle identifier for EarlGrey tests as for unit tests
-      # when managing certificates as the number of free certs is limited.
-      extra_substitutions +=
-          [ "CHROMIUM_BUNDLE_ID=gtest.${ios_generic_test_bundle_id_suffix}" ]
-    } else {
-      extra_substitutions += [ "CHROMIUM_BUNDLE_ID=gtest.$target_name" ]
-    }
   }
 }
 

ios/chrome/test/earl_grey2/chrome_ios_eg2_test.gni

@@ -119,15 +119,8 @@ template("chrome_ios_eg2_test_app_host") {
       "EG_MAIN_APPLICATION_DELEGATE=$_eg_main_application_delegate",
       "SSOAUTH_URL_SCHEME=$url_ssoauth_scheme",
       "CONTENT_WIDGET_EXTENSION_BUNDLE_ID=$chromium_bundle_id.ContentTodayExtension",
+      "CHROMIUM_BUNDLE_ID=gtest.$target_name",
     ]
-    if (ios_automatically_manage_certs) {
-      # Use the same bundle identifier for EarlGrey tests as for unit tests
-      # when managing certificates as the number of free certs is limited.
-      extra_substitutions +=
-          [ "CHROMIUM_BUNDLE_ID=gtest.${ios_generic_test_bundle_id_suffix}" ]
-    } else {
-      extra_substitutions += [ "CHROMIUM_BUNDLE_ID=gtest.$target_name" ]
-    }
   }
 }
 

testing/test.gni

@@ -318,10 +318,8 @@ template("test") {
         info_plist = "//testing/gtest_ios/unittest-Info.plist"
       }
 
-      _bundle_id_suffix = ios_generic_test_bundle_id_suffix
-      if (!ios_automatically_manage_certs) {
-        _bundle_id_suffix = "${target_name}"
-      }
+      _bundle_id_suffix = "${target_name}"
+
       if (!defined(extra_substitutions)) {
         extra_substitutions = []
       }