More work on removing variants from Autofill

components/autofill/core/browser/data_driven_test.cc

Index: components/autofill/core/browser/data_driven_test.cc
diff --git a/components/autofill/core/browser/data_driven_test.cc b/components/autofill/core/browser/data_driven_test.cc
index 01d37a2fe64b9c5b049b52b37df8c91ecde1c09b..e1666994bd49b034e064278fbcaf8425cd0357de 100644
--- a/components/autofill/core/browser/data_driven_test.cc
+++ b/components/autofill/core/browser/data_driven_test.cc
@@ -52,6 +52,11 @@ void DataDrivenTest::RunDataDrivenTest(
 void DataDrivenTest::RunOneDataDrivenTest(
     const base::FilePath& test_file_name,
     const base::FilePath& output_directory) {
+  // iOS doesn't get rid of removed test files. TODO(estade): remove this after
+  // all iOS bots are clobbered.
+  if (test_file_name.BaseName().value() == FILE_PATH_LITERAL("multimerge.in"))
+    return;
+
   ASSERT_TRUE(base::DirectoryExists(output_directory));
   SCOPED_TRACE(test_file_name.BaseName().value());