| 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 10 matching lines...) Expand all Loading... |
| 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" |
| 25 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
| 26 #include "chrome/browser/translate/translate_infobar_delegate.h" | 26 #include "chrome/browser/translate/translate_infobar_delegate.h" |
| 27 #include "chrome/browser/translate/translate_manager.h" | 27 #include "chrome/browser/translate/translate_manager.h" |
| 28 #include "chrome/browser/ui/browser.h" | 28 #include "chrome/browser/ui/browser.h" |
| 29 #include "chrome/browser/ui/browser_tabstrip.h" | 29 #include "chrome/browser/ui/browser_tabstrip.h" |
| 30 #include "chrome/browser/ui/browser_window.h" | 30 #include "chrome/browser/ui/browser_window.h" |
| 31 #include "chrome/browser/ui/tab_contents/tab_contents.h" | |
| 32 #include "chrome/common/chrome_notification_types.h" | 31 #include "chrome/common/chrome_notification_types.h" |
| 33 #include "chrome/common/render_messages.h" | 32 #include "chrome/common/render_messages.h" |
| 34 #include "chrome/test/base/in_process_browser_test.h" | 33 #include "chrome/test/base/in_process_browser_test.h" |
| 35 #include "chrome/test/base/ui_test_utils.h" | 34 #include "chrome/test/base/ui_test_utils.h" |
| 36 #include "content/public/browser/navigation_controller.h" | 35 #include "content/public/browser/navigation_controller.h" |
| 37 #include "content/public/browser/notification_observer.h" | 36 #include "content/public/browser/notification_observer.h" |
| 38 #include "content/public/browser/notification_registrar.h" | 37 #include "content/public/browser/notification_registrar.h" |
| 39 #include "content/public/browser/notification_service.h" | 38 #include "content/public/browser/notification_service.h" |
| 40 #include "content/public/browser/render_view_host.h" | 39 #include "content/public/browser/render_view_host.h" |
| 41 #include "content/public/browser/web_contents.h" | 40 #include "content/public/browser/web_contents.h" |
| (...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1496 // TODO(isherman): this looks redundant, consider removing. | 1495 // TODO(isherman): this looks redundant, consider removing. |
| 1497 // DISABLED: http://crbug.com/150084 | 1496 // DISABLED: http://crbug.com/150084 |
| 1498 IN_PROC_BROWSER_TEST_F(AutofillTest, | 1497 IN_PROC_BROWSER_TEST_F(AutofillTest, |
| 1499 DISABLED_MergeAggregatedDuplicatedProfiles) { | 1498 DISABLED_MergeAggregatedDuplicatedProfiles) { |
| 1500 int num_of_profiles = | 1499 int num_of_profiles = |
| 1501 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); | 1500 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); |
| 1502 | 1501 |
| 1503 ASSERT_GT(num_of_profiles, | 1502 ASSERT_GT(num_of_profiles, |
| 1504 static_cast<int>(personal_data_manager()->profiles().size())); | 1503 static_cast<int>(personal_data_manager()->profiles().size())); |
| 1505 } | 1504 } |
| OLD | NEW |