Disable several AutofillInteractive tests on ChromeOS

chrome/browser/autofill/autofill_interactive_uitest.cc

Index: chrome/browser/autofill/autofill_interactive_uitest.cc
diff --git a/chrome/browser/autofill/autofill_interactive_uitest.cc b/chrome/browser/autofill/autofill_interactive_uitest.cc
index 0d77fb1f0d8a9164b2b51713ccb996b78434e9d1..a7e2f85eb7f990e52afca70fafa070b9473c687f 100644
--- a/chrome/browser/autofill/autofill_interactive_uitest.cc
+++ b/chrome/browser/autofill/autofill_interactive_uitest.cc
@@ -469,7 +469,13 @@ class AutofillInteractiveTest : public InProcessBrowserTest {
 };
 
 // Test that basic form fill is working.
-IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, BasicFormFill) {
+// Flakily times out on ChromeOS http://crbug.com/585885
+#if defined(OS_CHROMEOS)
+#define MAYBE_BasicFormFill DISABLED_BasicFormFill
+#else
+#define MAYBE_BasicFormFill BasicFormFill
+#endif
+IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, MAYBE_BasicFormFill) {
   CreateTestProfile();
 
   // Load the test page.
@@ -686,7 +692,13 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
 }
 
 // Test that a JavaScript oninput event is fired after auto-filling a form.
-IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, OnInputAfterAutofill) {
+// Flakily times out on ChromeOS http://crbug.com/585885
+#if defined(OS_CHROMEOS)
+#define MAYBE_OnInputAfterAutofill DISABLED_OnInputAfterAutofill
+#else
+#define MAYBE_OnInputAfterAutofill OnInputAfterAutofill
+#endif
+IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, MAYBE_OnInputAfterAutofill) {
   CreateTestProfile();
 
   const char kOnInputScript[] =
@@ -835,7 +847,13 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, MAYBE_OnChangeAfterAutofill) {
   EXPECT_FALSE(unchanged_select_fired);
 }
 
-IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, InputFiresBeforeChange) {
+// Flakily times out on ChromeOS http://crbug.com/585885
+#if defined(OS_CHROMEOS)
+#define MAYBE_InputFiresBeforeChange DISABLED_InputFiresBeforeChange
+#else
+#define MAYBE_InputFiresBeforeChange InputFiresBeforeChange
+#endif
+IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, MAYBE_InputFiresBeforeChange) {
   CreateTestProfile();
 
   const char kInputFiresBeforeChangeScript[] =
@@ -946,7 +964,15 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
 // In the wild, the repeated fields are typically either email fields
 // (duplicated for "confirmation"); or variants that are hot-swapped via
 // JavaScript, with only one actually visible at any given time.
-IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, AutofillFormWithRepeatedField) {
+// Flakily times out on ChromeOS http://crbug.com/585885
+#if defined(OS_CHROMEOS)
+#define MAYBE_AutofillFormWithRepeatedField \
+  DISABLED_AutofillFormWithRepeatedField
+#else
+#define MAYBE_AutofillFormWithRepeatedField AutofillFormWithRepeatedField
+#endif
+IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
+                       MAYBE_AutofillFormWithRepeatedField) {
   CreateTestProfile();
 
   // Load the test page.
@@ -1276,11 +1302,12 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest, MAYBE_ComparePhoneNumbers) {
 
 // Test that Autofill does not fill in read-only fields.
 // Flaky on the official cros-trunk. crbug.com/516052
-#if defined(OFFICIAL_BUILD)
+// Also flaky on ChromiumOS generally. crbug.com/585885
+#if defined(OFFICIAL_BUILD) || defined(OS_CHROMEOS)
 #define MAYBE_NoAutofillForReadOnlyFields DISABLED_NoAutofillForReadOnlyFields
 #else
 #define MAYBE_NoAutofillForReadOnlyFields NoAutofillForReadOnlyFields
-#endif  // defined(OFFICIAL_BUILD)
+#endif  // defined(OFFICIAL_BUILD) || defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
                        MAYBE_NoAutofillForReadOnlyFields) {
   std::string addr_line1("1234 H St.");
@@ -1440,8 +1467,15 @@ IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
 // Test that Chrome doesn't crash when autocomplete is disabled while the user
 // is interacting with the form.  This is a regression test for
 // http://crbug.com/160476
+// Flakily times out on ChromeOS http://crbug.com/585885
+#if defined(OS_CHROMEOS)
+#define MAYBE_DisableAutocompleteWhileFilling \
+  DISABLED_DisableAutocompleteWhileFilling
+#else
+#define MAYBE_DisableAutocompleteWhileFilling DisableAutocompleteWhileFilling
+#endif
 IN_PROC_BROWSER_TEST_F(AutofillInteractiveTest,
-                       DisableAutocompleteWhileFilling) {
+                       MAYBE_DisableAutocompleteWhileFilling) {
   CreateTestProfile();
 
   // Load the test page.