| 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/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 content::NotificationRegistrar registrar_; | 116 content::NotificationRegistrar registrar_; |
| 117 InfoBarService* infobar_service_; | 117 InfoBarService* infobar_service_; |
| 118 }; | 118 }; |
| 119 | 119 |
| 120 class AutofillTest : public InProcessBrowserTest { | 120 class AutofillTest : public InProcessBrowserTest { |
| 121 protected: | 121 protected: |
| 122 AutofillTest() {} | 122 AutofillTest() {} |
| 123 | 123 |
| 124 virtual void SetUpOnMainThread() OVERRIDE { | 124 virtual void SetUpOnMainThread() OVERRIDE { |
| 125 // Don't want Keychain coming up on Mac. | 125 // Don't want Keychain coming up on Mac. |
| 126 test::DisableSystemServices(browser()->profile()); | 126 test::DisableSystemServices(browser()->profile()->GetPrefs()); |
| 127 } | 127 } |
| 128 | 128 |
| 129 virtual void CleanUpOnMainThread() OVERRIDE { | 129 virtual void CleanUpOnMainThread() OVERRIDE { |
| 130 // Make sure to close any showing popups prior to tearing down the UI. | 130 // Make sure to close any showing popups prior to tearing down the UI. |
| 131 content::WebContents* web_contents = | 131 content::WebContents* web_contents = |
| 132 browser()->tab_strip_model()->GetActiveWebContents(); | 132 browser()->tab_strip_model()->GetActiveWebContents(); |
| 133 AutofillManager* autofill_manager = | 133 AutofillManager* autofill_manager = |
| 134 AutofillDriverImpl::FromWebContents(web_contents)->autofill_manager(); | 134 AutofillDriverImpl::FromWebContents(web_contents)->autofill_manager(); |
| 135 autofill_manager->delegate()->HideAutofillPopup(); | 135 autofill_manager->delegate()->HideAutofillPopup(); |
| 136 } | 136 } |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 730 IN_PROC_BROWSER_TEST_F(AutofillTest, | 730 IN_PROC_BROWSER_TEST_F(AutofillTest, |
| 731 DISABLED_MergeAggregatedDuplicatedProfiles) { | 731 DISABLED_MergeAggregatedDuplicatedProfiles) { |
| 732 int num_of_profiles = | 732 int num_of_profiles = |
| 733 AggregateProfilesIntoAutofillPrefs("dataset_duplicated_profiles.txt"); | 733 AggregateProfilesIntoAutofillPrefs("dataset_duplicated_profiles.txt"); |
| 734 | 734 |
| 735 ASSERT_GT(num_of_profiles, | 735 ASSERT_GT(num_of_profiles, |
| 736 static_cast<int>(personal_data_manager()->GetProfiles().size())); | 736 static_cast<int>(personal_data_manager()->GetProfiles().size())); |
| 737 } | 737 } |
| 738 | 738 |
| 739 } // namespace autofill | 739 } // namespace autofill |
| OLD | NEW |