More work on removing variants from Autofill

components/autofill/core/browser/data_driven_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/autofill/core/browser/data_driven_test.h"
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 34 matching lines @@
   for (base::FilePath input_file = input_files.Next();
        !input_file.empty();
        input_file = input_files.Next()) {
     RunOneDataDrivenTest(input_file, output_directory);
   }
 }
 
 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());
 
   std::string input;
   ReadFile(test_file_name, &input);
 
   std::string output;
   GenerateResults(input, &output);
 
   base::FilePath output_file = output_directory.Append(
@@ skipping 26 matching lines @@
 }
 
 DataDrivenTest::DataDrivenTest(const base::FilePath& test_data_directory)
     : test_data_directory_(test_data_directory) {
 }
 
 DataDrivenTest::~DataDrivenTest() {
 }
 
 }  // namespace autofill