[Autofill] Mark a few DISABLED tests as FLAKY

chrome/browser/autofill/autofill_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 <string>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 523 matching lines @@
 
  private:
   net::TestURLFetcherFactory url_fetcher_factory_;
   scoped_ptr<TestAutofillExternalDelegate> external_delegate_;
 };
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_BasicFormFill BasicFormFill
 #else
-#define MAYBE_BasicFormFill DISABLED_BasicFormFill
+#define MAYBE_BasicFormFill FLAKY_BasicFormFill
 #endif
 // Test that basic form fill is working.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_BasicFormFill) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_AutofillViaDownArrow AutofillViaDownArrow
 #else
-#define MAYBE_AutofillViaDownArrow DISABLED_AutofillViaDownArrow
+#define MAYBE_AutofillViaDownArrow FLAKY_AutofillViaDownArrow
 #endif
 // Test that form filling can be initiated by pressing the down arrow.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_AutofillViaDownArrow) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Focus a fillable field.
@@ skipping 11 matching lines @@
   SendKeyToPopupAndWait(ui::VKEY_RETURN);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
 // http://crbug.com/150084
 #if defined(OS_MACOSX)
 #define MAYBE_OnChangeAfterAutofill OnChangeAfterAutofill
 #else
-#define MAYBE_OnChangeAfterAutofill DISABLED_OnChangeAfterAutofill
+#define MAYBE_OnChangeAfterAutofill FLAKY_OnChangeAfterAutofill
 #endif
 // Test that a JavaScript onchange event is fired after auto-filling a form.
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_OnChangeAfterAutofill) {
   CreateTestProfile();
 
   const char* kOnChangeScript =
       "<script>"
       "focused_fired = false;"
       "unfocused_fired = false;"
       "changed_select_fired = false;"
@@ skipping 1111 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        DISABLED_MergeAggregatedDuplicatedProfiles) {
   int num_of_profiles =
       AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_GT(num_of_profiles,
             static_cast<int>(personal_data_manager()->GetProfiles().size()));
 }
 
 }  // namespace autofill