Disable much of AutofillTest.* browser_tests

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 403 matching lines @@
         ui::VKEY_RETURN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
     // The form should be filled.
     ExpectFilledTestForm();
   }
 
  private:
   net::TestURLFetcherFactory url_fetcher_factory_;
 };
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_BasicFormFill BasicFormFill
+#else
+#define MAYBE_BasicFormFill DISABLED_BasicFormFill
+#endif
 // Test that basic form fill is working.
-IN_PROC_BROWSER_TEST_F(AutofillTest, BasicFormFill) {
+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
+#endif
 // Test that form filling can be initiated by pressing the down arrow.
-IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillViaDownArrow) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_AutofillViaDownArrow) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Focus a fillable field.
   FocusFirstNameField();
 
   // Press the down arrow to initiate Autofill and wait for the popup to be
   // shown.
   SendKeyAndWait(
       ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_SHOW_SUGGESTIONS);
 
   // Press the down arrow to select the suggestion and preview the autofilled
   // form.
   SendKeyAndWait(
       ui::VKEY_DOWN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
   // Press Enter to accept the autofill suggestions.
   SendKeyAndWait(
       ui::VKEY_RETURN, chrome::NOTIFICATION_AUTOFILL_DID_FILL_FORM_DATA);
 
   // The form should be filled.
   ExpectFilledTestForm();
 }
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_OnChangeAfterAutofill OnChangeAfterAutofill
+#else
+#define MAYBE_OnChangeAfterAutofill DISABLED_OnChangeAfterAutofill
+#endif
 // Test that a JavaScript onchange event is fired after auto-filling a form.
-IN_PROC_BROWSER_TEST_F(AutofillTest, OnChangeAfterAutofill) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_OnChangeAfterAutofill) {
   CreateTestProfile();
 
   const char* kOnChangeScript =
       "<script>"
       "focused_fired = false;"
       "unfocused_fired = false;"
       "changed_select_fired = false;"
       "unchanged_select_fired = false;"
       "document.getElementById('firstname').onchange = function() {"
       "  focused_fired = true;"
@@ skipping 63 matching lines @@
 
   // Unfocus the first name field. Its change event should fire.
   ASSERT_TRUE(content::ExecuteJavaScriptAndExtractBool(
       render_view_host(), L"",
       L"document.getElementById('firstname').blur();"
       L"domAutomationController.send(focused_fired);", &focused_fired));
   EXPECT_TRUE(focused_fired);
 }
 
 // Test that we can autofill forms distinguished only by their |id| attribute.
-IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillFormsDistinguishedById) {
+// DISABLED: http://crbug.com/150084
+IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillFormsDistinguishedById) {
   CreateTestProfile();
 
   // Load the test page.
   const std::string kURL =
       std::string(kDataURIPrefix) + kTestFormString +
       "<script>"
       "var mainForm = document.forms[0];"
       "mainForm.id = 'mainForm';"
       "var newForm = document.createElement('form');"
       "newForm.action = mainForm.action;"
       "newForm.method = mainForm.method;"
       "newForm.id = 'newForm';"
       "mainForm.parentNode.insertBefore(newForm, mainForm);"
       "</script>";
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(), GURL(kURL)));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that we properly autofill forms with repeated fields.
 // 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(AutofillTest, AutofillFormWithRepeatedField) {
+// DISABLED: http://crbug.com/150084
+IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillFormWithRepeatedField) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) +
            "<form action=\"http://www.example.com/\" method=\"POST\">"
            "<label for=\"firstname\">First name:</label>"
            " <input type=\"text\" id=\"firstname\""
            "        onFocus=\"domAutomationController.send(true)\"><br>"
@@ skipping 24 matching lines @@
            " </select><br>"
            "<label for=\"phone\">Phone number:</label>"
            " <input type=\"text\" id=\"phone\"><br>"
            "</form>")));
 
   // Invoke Autofill.
   TryBasicFormFill();
   ExpectFieldValue(L"state_freeform", "");
 }
 
-#if defined(OS_WIN)
-// Has been observed to fail on windows.  crbug.com/100062
+// http://crbug.com/150084
+#if defined(OS_MAC)

[Nico, 2013/03/13 23:24:46]

It's OS_MACOSX ( https://codereview.chromium.org/12829005/ )

+#define MAYBE_AutofillFormWithNonAutofillableField \
+    AutofillFormWithNonAutofillableField
+#else
 #define MAYBE_AutofillFormWithNonAutofillableField \
     DISABLED_AutofillFormWithNonAutofillableField
-#else
-#define MAYBE_AutofillFormWithNonAutofillableField \
-    AutofillFormWithNonAutofillableField
 #endif
 
 // Test that we properly autofill forms with non-autofillable fields.
 IN_PROC_BROWSER_TEST_F(AutofillTest,
                        MAYBE_AutofillFormWithNonAutofillableField) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
@@ skipping 28 matching lines @@
            " </select><br>"
            "<label for=\"phone\">Phone number:</label>"
            " <input type=\"text\" id=\"phone\"><br>"
            "</form>")));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that we can Autofill dynamically generated forms.
-IN_PROC_BROWSER_TEST_F(AutofillTest, DynamicFormFill) {
+// DISABLED: http://crbug.com/150084
+IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_DynamicFormFill) {
   CreateTestProfile();
 
   // Load the test page.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) +
            "<form id=\"form\" action=\"http://www.example.com/\""
            "      method=\"POST\"></form>"
            "<script>"
            "function AddElement(name, label) {"
@@ skipping 70 matching lines @@
   ASSERT_TRUE(content::ExecuteJavaScript(render_view_host(), L"",
                                          L"BuildForm();"));
 
   // Invoke Autofill.
   TryBasicFormFill();
 }
 
 // Test that form filling works after reloading the current page.
 // This test brought to you by http://crbug.com/69204
 #if defined(OS_MACOSX)
-// Sometimes times out on Mac: http://crbug.com/81451
-// Currently enabled for logging.
+// Now flaky on everything but mac.
+// http://crbug.com/150084
 #define MAYBE_AutofillAfterReload AutofillAfterReload
 #else
-#define MAYBE_AutofillAfterReload AutofillAfterReload
+#define MAYBE_AutofillAfterReload DISABLED_AutofillAfterReload
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_AutofillAfterReload) {
   LOG(WARNING) << "Creating test profile.";
   CreateTestProfile();
 
   // Load the test page.
   LOG(WARNING) << "Bringing browser window to front.";
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   LOG(WARNING) << "Navigating to URL.";
   ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(browser(),
       GURL(std::string(kDataURIPrefix) + kTestFormString)));
 
   // Reload the page.
   LOG(WARNING) << "Reloading the page.";
   WebContents* tab = chrome::GetActiveWebContents(browser());
   tab->GetController().Reload(false);
   content::WaitForLoadStop(tab);
 
   // Invoke Autofill.
   LOG(WARNING) << "Trying to fill the form.";
   TryBasicFormFill();
 }
 
-#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
-// Test that autofill works after page translation.
-// http://crbug.com/81451
+// DISABLED: http://crbug.com/150084
 IN_PROC_BROWSER_TEST_F(AutofillTest, DISABLED_AutofillAfterTranslate) {
-#else
-IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillAfterTranslate) {
-#endif
   CreateTestProfile();
 
   GURL url(std::string(kDataURIPrefix) +
                "<form action=\"http://www.example.com/\" method=\"POST\">"
                "<label for=\"fn\">なまえ</label>"
                " <input type=\"text\" id=\"fn\""
                "        onFocus=\"domAutomationController.send(true)\""
                "><br>"
                "<label for=\"ln\">みょうじ</label>"
                " <input type=\"text\" id=\"ln\"><br>"
@@ skipping 269 matching lines @@
   data["ADDRESS_HOME_CITY"] = "San Jose";
   data["ADDRESS_HOME_STATE"] = "CA";
   data["ADDRESS_HOME_ZIP"] = "95110";
   data["COMPANY_NAME"] = "Company X";
   data["PHONE_HOME_WHOLE_NUMBER"] = "408-871-4567";
   FillFormAndSubmit("duplicate_profiles_test.html", data);
 
   ASSERT_TRUE(personal_data_manager()->profiles().empty());
 }
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_ComparePhoneNumbers ComparePhoneNumbers
+#else
+#define MAYBE_ComparePhoneNumbers DISABLED_ComparePhoneNumbers
+#endif
 // Test phone fields parse correctly from a given profile.
 // The high level key presses execute the following: Select the first text
 // field, invoke the autofill popup list, select the first profile within the
 // list, and commit to the profile to populate the form.
-IN_PROC_BROWSER_TEST_F(AutofillTest, ComparePhoneNumbers) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_ComparePhoneNumbers) {
   ASSERT_TRUE(test_server()->Start());
 
   AutofillProfile profile;
   profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
   profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
   profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16("1234 H St."));
   profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
   profile.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
   profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
   profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("1-408-555-4567"));
@@ skipping 18 matching lines @@
   ExpectFieldValue(L"PHONE_HOME_NUMBER_4-1", "4567");
   ExpectFieldValue(L"PHONE_HOME_NUMBER_4-2", "4567");
   ExpectFieldValue(L"PHONE_HOME_EXT-1", "");
   ExpectFieldValue(L"PHONE_HOME_EXT-2", "");
   ExpectFieldValue(L"PHONE_HOME_COUNTRY_CODE-1", "1");
 }
 
 // Test profile is saved if phone number is valid in selected country.
 // The data file contains two profiles with valid phone numbers and two
 // profiles with invalid phone numbers from their respective country.
-IN_PROC_BROWSER_TEST_F(AutofillTest, ProfileSavedWithValidCountryPhone) {
+// DISABLED: http://crbug.com/150084
+IN_PROC_BROWSER_TEST_F(AutofillTest,
+                       DISABLED_ProfileSavedWithValidCountryPhone) {
   ASSERT_TRUE(test_server()->Start());
   std::vector<FormMap> profiles;
 
   FormMap data1;
   data1["NAME_FIRST"] = "Bob";
   data1["NAME_LAST"] = "Smith";
   data1["ADDRESS_HOME_LINE1"] = "123 Cherry Ave";
   data1["ADDRESS_HOME_CITY"] = "Mountain View";
   data1["ADDRESS_HOME_STATE"] = "CA";
   data1["ADDRESS_HOME_ZIP"] = "94043";
@@ skipping 80 matching lines @@
   data["CREDIT_CARD_NUMBER"] = "4408041234567893";
   data["CREDIT_CARD_EXP_MONTH"] = "12";
   data["CREDIT_CARD_EXP_4_DIGIT_YEAR"] = "2014";
   FillFormAndSubmit("cc_autocomplete_off_test.html", data);
 
   ASSERT_EQ(0u,
             InfoBarService::FromTabContents(
                 chrome::GetActiveTabContents(browser()))->GetInfoBarCount());
 }
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_NoAutofillForReadOnlyFields NoAutofillForReadOnlyFields
+#else
+#define MAYBE_NoAutofillForReadOnlyFields DISABLED_NoAutofillForReadOnlyFields
+#endif
 // Test that Autofill does not fill in read-only fields.
-IN_PROC_BROWSER_TEST_F(AutofillTest, NoAutofillForReadOnlyFields) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_NoAutofillForReadOnlyFields) {
   ASSERT_TRUE(test_server()->Start());
 
   std::string addr_line1("1234 H St.");
 
   AutofillProfile profile;
   profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
   profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
   profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16("bsmith@gmail.com"));
   profile.SetInfo(ADDRESS_HOME_LINE1, ASCIIToUTF16(addr_line1));
   profile.SetInfo(ADDRESS_HOME_CITY, ASCIIToUTF16("San Jose"));
   profile.SetInfo(ADDRESS_HOME_STATE, ASCIIToUTF16("CA"));
   profile.SetInfo(ADDRESS_HOME_ZIP, ASCIIToUTF16("95110"));
   profile.SetInfo(COMPANY_NAME, ASCIIToUTF16("Company X"));
   profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("408-871-4567"));
   SetProfile(profile);
 
   GURL url = test_server()->GetURL("files/autofill/read_only_field_test.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("firstname");
 
   ExpectFieldValue(L"email", "");
   ExpectFieldValue(L"address", addr_line1);
 }
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_FormFillableOnReset FormFillableOnReset
+#else
+#define MAYBE_FormFillableOnReset DISABLED_FormFillableOnReset
+#endif
 // Test form is fillable from a profile after form was reset.
 // Steps:
 //   1. Fill form using a saved profile.
 //   2. Reset the form.
 //   3. Fill form using a saved profile.
-IN_PROC_BROWSER_TEST_F(AutofillTest, FormFillableOnReset) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillableOnReset) {
   ASSERT_TRUE(test_server()->Start());
 
   CreateTestProfile();
 
   GURL url = test_server()->GetURL("files/autofill/autofill_test_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
   ASSERT_TRUE(content::ExecuteJavaScript(
       chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
       L"document.getElementById('testform').reset()"));
 
   PopulateForm("NAME_FIRST");
 
   ExpectFieldValue(L"NAME_FIRST", "Milton");
   ExpectFieldValue(L"NAME_LAST", "Waddams");
   ExpectFieldValue(L"EMAIL_ADDRESS", "red.swingline@initech.com");
   ExpectFieldValue(L"ADDRESS_HOME_LINE1", "4120 Freidrich Lane");
   ExpectFieldValue(L"ADDRESS_HOME_CITY", "Austin");
   ExpectFieldValue(L"ADDRESS_HOME_STATE", "Texas");
   ExpectFieldValue(L"ADDRESS_HOME_ZIP", "78744");
   ExpectFieldValue(L"ADDRESS_HOME_COUNTRY", "United States");
   ExpectFieldValue(L"PHONE_HOME_WHOLE_NUMBER", "5125551234");
 }
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_DistinguishMiddleInitialWithinName \
+    DistinguishMiddleInitialWithinName
+#else
+#define MAYBE_DistinguishMiddleInitialWithinName \
+    DISABLED_DistinguishMiddleInitialWithinName
+#endif
 // Test Autofill distinguishes a middle initial in a name.
-IN_PROC_BROWSER_TEST_F(AutofillTest, DistinguishMiddleInitialWithinName) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_DistinguishMiddleInitialWithinName) {
   ASSERT_TRUE(test_server()->Start());
 
   CreateTestProfile();
 
   GURL url = test_server()->GetURL(
       "files/autofill/autofill_middleinit_form.html");
   ui_test_utils::NavigateToURL(browser(), url);
   PopulateForm("NAME_FIRST");
 
   ExpectFieldValue(L"NAME_MIDDLE", "C");
 }
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_MultipleEmailFilledByOneUserGesture \
+    MultipleEmailFilledByOneUserGesture
+#else
+#define MAYBE_MultipleEmailFilledByOneUserGesture \
+    DISABLED_MultipleEmailFilledByOneUserGesture
+#endif
 // Test forms with multiple email addresses are filled properly.
 // Entire form should be filled with one user gesture.
-IN_PROC_BROWSER_TEST_F(AutofillTest, MultipleEmailFilledByOneUserGesture) {
+IN_PROC_BROWSER_TEST_F(AutofillTest,
+                       MAYBE_MultipleEmailFilledByOneUserGesture) {
   ASSERT_TRUE(test_server()->Start());
 
   std::string email("bsmith@gmail.com");
 
   AutofillProfile profile;
   profile.SetInfo(NAME_FIRST, ASCIIToUTF16("Bob"));
   profile.SetInfo(NAME_LAST, ASCIIToUTF16("Smith"));
   profile.SetInfo(EMAIL_ADDRESS, ASCIIToUTF16(email));
   profile.SetInfo(PHONE_HOME_WHOLE_NUMBER, ASCIIToUTF16("4088714567"));
   SetProfile(profile);
@@ skipping 18 matching lines @@
   data["ADDRESS_HOME_CITY"] = "San Jose";
   data["ADDRESS_HOME_STATE"] = "CA";
   data["ADDRESS_HOME_ZIP"] = "95110";
   data["COMPANY_NAME"] = "Company X";
   data["PHONE_HOME_WHOLE_NUMBER"] = "408-871-4567";
   FillFormAndSubmit("duplicate_profiles_test.html", data);
 
   ASSERT_EQ(0u, personal_data_manager()->profiles().size());
 }
 
+// http://crbug.com/150084
+#if defined(OS_MACOSX)
+#define MAYBE_FormFillLatencyAfterSubmit FormFillLatencyAfterSubmit
+#else
+#define MAYBE_FormFillLatencyAfterSubmit DISABLED_FormFillLatencyAfterSubmit
+#endif
 // Test latency time on form submit with lots of stored Autofill profiles.
 // This test verifies when a profile is selected from the Autofill dictionary
 // that consists of thousands of profiles, the form does not hang after being
 // submitted.
-// crbug.com/150084
-IN_PROC_BROWSER_TEST_F(AutofillTest, FLAKY_FormFillLatencyAfterSubmit) {
+IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_FormFillLatencyAfterSubmit) {
   ASSERT_TRUE(test_server()->Start());
 
   std::vector<std::string> cities;
   cities.push_back("San Jose");
   cities.push_back("San Francisco");
   cities.push_back("Sacramento");
   cities.push_back("Los Angeles");
 
   std::vector<std::string> streets;
   streets.push_back("St");
@@ skipping 43 matching lines @@
       ASCIIToWide("document.getElementById('testform').submit();")));
   // This will ensure the test didn't hang.
   load_stop_observer.Wait();
 }
 
 // Test that profiles merge for aggregated data with same address.
 // The criterion for when two profiles are expected to be merged is when their
 // 'Address Line 1' and 'City' data match. When two profiles are merged, any
 // remaining address fields are expected to be overwritten. Any non-address
 // fields should accumulate multi-valued data.
-IN_PROC_BROWSER_TEST_F(AutofillTest, MergeAggregatedProfilesWithSameAddress) {
+// DISABLED: http://crbug.com/150084
+IN_PROC_BROWSER_TEST_F(AutofillTest,
+                       DISABLED_MergeAggregatedProfilesWithSameAddress) {
   AggregateProfilesIntoAutofillPrefs("dataset_2.txt");
 
   ASSERT_EQ(3u, personal_data_manager()->profiles().size());
 }
 
 // Test profiles are not merged without mininum address values.
 // Mininum address values needed during aggregation are: address line 1, city,
 // state, and zip code.
 // Profiles are merged when data for address line 1 and city match.
-IN_PROC_BROWSER_TEST_F(AutofillTest, ProfilesNotMergedWhenNoMinAddressData) {
+// DISABLED: http://crbug.com/150084
+IN_PROC_BROWSER_TEST_F(AutofillTest,
+                       DISABLED_ProfilesNotMergedWhenNoMinAddressData) {
   AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt");
 
   ASSERT_EQ(0u, personal_data_manager()->profiles().size());
 }
 
-#if defined(OS_LINUX)
-// Has been observed to fail on linux.  crbug.com/146688
-#define MAYBE_MergeAggregatedDuplicatedProfiles \
-    DISABLED_MergeAggregatedDuplicatedProfiles
-#else
-#define MAYBE_MergeAggregatedDuplicatedProfiles \
-    MergeAggregatedDuplicatedProfiles
-#endif
-
 // Test Autofill ability to merge duplicate profiles and throw away junk.
 // TODO(isherman): this looks redundant, consider removing.
-IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_MergeAggregatedDuplicatedProfiles) {
+// DISABLED: http://crbug.com/150084
+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()->profiles().size()));
 }