OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <string> | 5 #include <string> |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/memory/ref_counted.h" | 9 #include "base/memory/ref_counted.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
739 "<label for=\"phone\">Phone number:</label>" | 739 "<label for=\"phone\">Phone number:</label>" |
740 " <input type=\"text\" id=\"phone\"><br>" | 740 " <input type=\"text\" id=\"phone\"><br>" |
741 "</form>"))); | 741 "</form>"))); |
742 | 742 |
743 // Invoke Autofill. | 743 // Invoke Autofill. |
744 TryBasicFormFill(); | 744 TryBasicFormFill(); |
745 ExpectFieldValue("state_freeform", ""); | 745 ExpectFieldValue("state_freeform", ""); |
746 } | 746 } |
747 | 747 |
748 // http://crbug.com/150084 | 748 // http://crbug.com/150084 |
749 #if defined(OS_MAC) | 749 #if defined(OS_MACOSX) |
750 #define MAYBE_AutofillFormWithNonAutofillableField \ | 750 #define MAYBE_AutofillFormWithNonAutofillableField \ |
751 AutofillFormWithNonAutofillableField | 751 AutofillFormWithNonAutofillableField |
752 #else | 752 #else |
753 #define MAYBE_AutofillFormWithNonAutofillableField \ | 753 #define MAYBE_AutofillFormWithNonAutofillableField \ |
754 DISABLED_AutofillFormWithNonAutofillableField | 754 DISABLED_AutofillFormWithNonAutofillableField |
755 #endif | 755 #endif |
756 | 756 |
757 // Test that we properly autofill forms with non-autofillable fields. | 757 // Test that we properly autofill forms with non-autofillable fields. |
758 IN_PROC_BROWSER_TEST_F(AutofillTest, | 758 IN_PROC_BROWSER_TEST_F(AutofillTest, |
759 MAYBE_AutofillFormWithNonAutofillableField) { | 759 MAYBE_AutofillFormWithNonAutofillableField) { |
(...skipping 952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1712 // TODO(isherman): this looks redundant, consider removing. | 1712 // TODO(isherman): this looks redundant, consider removing. |
1713 // DISABLED: http://crbug.com/150084 | 1713 // DISABLED: http://crbug.com/150084 |
1714 IN_PROC_BROWSER_TEST_F(AutofillTest, | 1714 IN_PROC_BROWSER_TEST_F(AutofillTest, |
1715 DISABLED_MergeAggregatedDuplicatedProfiles) { | 1715 DISABLED_MergeAggregatedDuplicatedProfiles) { |
1716 int num_of_profiles = | 1716 int num_of_profiles = |
1717 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); | 1717 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); |
1718 | 1718 |
1719 ASSERT_GT(num_of_profiles, | 1719 ASSERT_GT(num_of_profiles, |
1720 static_cast<int>(personal_data_manager()->GetProfiles().size())); | 1720 static_cast<int>(personal_data_manager()->GetProfiles().size())); |
1721 } | 1721 } |
OLD | NEW |