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" |
11 #include "base/rand_util.h" | 11 #include "base/rand_util.h" |
12 #include "base/string16.h" | 12 #include "base/string16.h" |
13 #include "base/string_split.h" | |
14 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 14 #include "base/strings/string_split.h" |
15 #include "base/time.h" | 15 #include "base/time.h" |
16 #include "base/utf_string_conversions.h" | 16 #include "base/utf_string_conversions.h" |
17 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" | 17 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" |
18 #include "chrome/browser/api/infobars/infobar_service.h" | 18 #include "chrome/browser/api/infobars/infobar_service.h" |
19 #include "chrome/browser/autofill/autofill_common_test.h" | 19 #include "chrome/browser/autofill/autofill_common_test.h" |
20 #include "chrome/browser/autofill/autofill_profile.h" | 20 #include "chrome/browser/autofill/autofill_profile.h" |
21 #include "chrome/browser/autofill/credit_card.h" | 21 #include "chrome/browser/autofill/credit_card.h" |
22 #include "chrome/browser/autofill/personal_data_manager.h" | 22 #include "chrome/browser/autofill/personal_data_manager.h" |
23 #include "chrome/browser/autofill/personal_data_manager_factory.h" | 23 #include "chrome/browser/autofill/personal_data_manager_factory.h" |
24 #include "chrome/browser/autofill/personal_data_manager_observer.h" | 24 #include "chrome/browser/autofill/personal_data_manager_observer.h" |
(...skipping 1580 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1605 // TODO(isherman): this looks redundant, consider removing. | 1605 // TODO(isherman): this looks redundant, consider removing. |
1606 // DISABLED: http://crbug.com/150084 | 1606 // DISABLED: http://crbug.com/150084 |
1607 IN_PROC_BROWSER_TEST_F(AutofillTest, | 1607 IN_PROC_BROWSER_TEST_F(AutofillTest, |
1608 DISABLED_MergeAggregatedDuplicatedProfiles) { | 1608 DISABLED_MergeAggregatedDuplicatedProfiles) { |
1609 int num_of_profiles = | 1609 int num_of_profiles = |
1610 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); | 1610 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); |
1611 | 1611 |
1612 ASSERT_GT(num_of_profiles, | 1612 ASSERT_GT(num_of_profiles, |
1613 static_cast<int>(personal_data_manager()->GetProfiles().size())); | 1613 static_cast<int>(personal_data_manager()->GetProfiles().size())); |
1614 } | 1614 } |
OLD | NEW |