Re-enable some autofill tests that were previously disabled for flake.

chrome/browser/autofill/form_structure_browsertest.cc

 // Copyright (c) 2012 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 <vector>
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 84 matching lines @@
       forms_string += " | " + base::UTF16ToUTF8((*field_iter)->name);
       forms_string += " | " + base::UTF16ToUTF8((*field_iter)->label);
       forms_string += " | " + base::UTF16ToUTF8((*field_iter)->value);
       forms_string += "\n";
     }
   }
   return forms_string;
 }
 
 // Heuristics tests timeout on Windows.  See http://crbug.com/85276
-// Also on ChromeOS/Aura. See crbug.com/173621
-// On Linux too. See crbug.com/323093
-#if defined(USE_AURA)
+#if defined(OS_WIN)
 #define MAYBE_DataDrivenHeuristics(n) DISABLED_DataDrivenHeuristics##n
 #else
 #define MAYBE_DataDrivenHeuristics(n) DataDrivenHeuristics##n
 #endif
 IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest, DataDrivenHeuristics00) {
   const base::FilePath::CharType kFileNamePattern[] =
       FILE_PATH_LITERAL("00_*.html");
   RunDataDrivenTest(GetInputDirectory(kTestName),
                     GetOutputDirectory(kTestName),
                     kFileNamePattern);
@@ skipping 126 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
     MAYBE_DataDrivenHeuristics(15)) {
   const base::FilePath::CharType kFileNamePattern[] =
       FILE_PATH_LITERAL("15_*.html");
   RunDataDrivenTest(GetInputDirectory(kTestName),
                     GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }
 
+// This test has real failures. http://crbug.com/323093
 IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
-    MAYBE_DataDrivenHeuristics(16)) {
+    DISABLED_DataDrivenHeuristics16) {
   const base::FilePath::CharType kFileNamePattern[] =
       FILE_PATH_LITERAL("16_*.html");
   RunDataDrivenTest(GetInputDirectory(kTestName),
                     GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }
 
 IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
     MAYBE_DataDrivenHeuristics(17)) {
   const base::FilePath::CharType kFileNamePattern[] =
       FILE_PATH_LITERAL("17_*.html");
   RunDataDrivenTest(GetInputDirectory(kTestName),
                     GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }
 
 IN_PROC_BROWSER_TEST_F(FormStructureBrowserTest,
     MAYBE_DataDrivenHeuristics(20)) {
   const base::FilePath::CharType kFileNamePattern[] =
       FILE_PATH_LITERAL("20_*.html");
   RunDataDrivenTest(GetInputDirectory(kTestName),
                     GetOutputDirectory(kTestName),
                     kFileNamePattern);
 }
 
 }  // namespace autofill