| 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 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 "<label for=\"phone\">Phone number:</label>" | 714 "<label for=\"phone\">Phone number:</label>" |
| 715 " <input type=\"text\" id=\"phone\"><br>" | 715 " <input type=\"text\" id=\"phone\"><br>" |
| 716 "</form>"))); | 716 "</form>"))); |
| 717 | 717 |
| 718 // Invoke Autofill. | 718 // Invoke Autofill. |
| 719 TryBasicFormFill(); | 719 TryBasicFormFill(); |
| 720 ExpectFieldValue("state_freeform", ""); | 720 ExpectFieldValue("state_freeform", ""); |
| 721 } | 721 } |
| 722 | 722 |
| 723 // http://crbug.com/150084 | 723 // http://crbug.com/150084 |
| 724 #if defined(OS_MAC) | 724 #if defined(OS_MACOSX) |
| 725 #define MAYBE_AutofillFormWithNonAutofillableField \ | 725 #define MAYBE_AutofillFormWithNonAutofillableField \ |
| 726 AutofillFormWithNonAutofillableField | 726 AutofillFormWithNonAutofillableField |
| 727 #else | 727 #else |
| 728 #define MAYBE_AutofillFormWithNonAutofillableField \ | 728 #define MAYBE_AutofillFormWithNonAutofillableField \ |
| 729 DISABLED_AutofillFormWithNonAutofillableField | 729 DISABLED_AutofillFormWithNonAutofillableField |
| 730 #endif | 730 #endif |
| 731 | 731 |
| 732 // Test that we properly autofill forms with non-autofillable fields. | 732 // Test that we properly autofill forms with non-autofillable fields. |
| 733 IN_PROC_BROWSER_TEST_F(AutofillTest, | 733 IN_PROC_BROWSER_TEST_F(AutofillTest, |
| 734 MAYBE_AutofillFormWithNonAutofillableField) { | 734 MAYBE_AutofillFormWithNonAutofillableField) { |
| (...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1689 // TODO(isherman): this looks redundant, consider removing. | 1689 // TODO(isherman): this looks redundant, consider removing. |
| 1690 // DISABLED: http://crbug.com/150084 | 1690 // DISABLED: http://crbug.com/150084 |
| 1691 IN_PROC_BROWSER_TEST_F(AutofillTest, | 1691 IN_PROC_BROWSER_TEST_F(AutofillTest, |
| 1692 DISABLED_MergeAggregatedDuplicatedProfiles) { | 1692 DISABLED_MergeAggregatedDuplicatedProfiles) { |
| 1693 int num_of_profiles = | 1693 int num_of_profiles = |
| 1694 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); | 1694 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); |
| 1695 | 1695 |
| 1696 ASSERT_GT(num_of_profiles, | 1696 ASSERT_GT(num_of_profiles, |
| 1697 static_cast<int>(personal_data_manager()->GetProfiles().size())); | 1697 static_cast<int>(personal_data_manager()->GetProfiles().size())); |
| 1698 } | 1698 } |
| OLD | NEW |