| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 has_run_message_loop_ = true; | 146 has_run_message_loop_ = true; |
| 147 content::RunMessageLoop(); | 147 content::RunMessageLoop(); |
| 148 } | 148 } |
| 149 PersonalDataManagerFactory::GetForProfile(browser_->profile())-> | 149 PersonalDataManagerFactory::GetForProfile(browser_->profile())-> |
| 150 RemoveObserver(this); | 150 RemoveObserver(this); |
| 151 } | 151 } |
| 152 | 152 |
| 153 // PersonalDataManagerObserver: | 153 // PersonalDataManagerObserver: |
| 154 virtual void OnPersonalDataChanged() OVERRIDE { | 154 virtual void OnPersonalDataChanged() OVERRIDE { |
| 155 if (has_run_message_loop_) { | 155 if (has_run_message_loop_) { |
| 156 MessageLoopForUI::current()->Quit(); | 156 base::MessageLoopForUI::current()->Quit(); |
| 157 has_run_message_loop_ = false; | 157 has_run_message_loop_ = false; |
| 158 } | 158 } |
| 159 alerted_ = true; | 159 alerted_ = true; |
| 160 } | 160 } |
| 161 | 161 |
| 162 virtual void OnInsufficientFormData() OVERRIDE { | 162 virtual void OnInsufficientFormData() OVERRIDE { |
| 163 OnPersonalDataChanged(); | 163 OnPersonalDataChanged(); |
| 164 } | 164 } |
| 165 | 165 |
| 166 // content::NotificationObserver: | 166 // content::NotificationObserver: |
| (...skipping 1568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1735 IN_PROC_BROWSER_TEST_F(AutofillTest, | 1735 IN_PROC_BROWSER_TEST_F(AutofillTest, |
| 1736 DISABLED_MergeAggregatedDuplicatedProfiles) { | 1736 DISABLED_MergeAggregatedDuplicatedProfiles) { |
| 1737 int num_of_profiles = | 1737 int num_of_profiles = |
| 1738 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); | 1738 AggregateProfilesIntoAutofillPrefs("dataset_no_address.txt"); |
| 1739 | 1739 |
| 1740 ASSERT_GT(num_of_profiles, | 1740 ASSERT_GT(num_of_profiles, |
| 1741 static_cast<int>(personal_data_manager()->GetProfiles().size())); | 1741 static_cast<int>(personal_data_manager()->GetProfiles().size())); |
| 1742 } | 1742 } |
| 1743 | 1743 |
| 1744 } // namespace autofill | 1744 } // namespace autofill |
| OLD | NEW |