| 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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "testing/gmock/include/gmock/gmock.h" | 46 #include "testing/gmock/include/gmock/gmock.h" |
| 47 #include "testing/gtest/include/gtest/gtest.h" | 47 #include "testing/gtest/include/gtest/gtest.h" |
| 48 #include "ui/events/keycodes/keyboard_codes.h" | 48 #include "ui/events/keycodes/keyboard_codes.h" |
| 49 | 49 |
| 50 using base::ASCIIToUTF16; | 50 using base::ASCIIToUTF16; |
| 51 using base::UTF16ToASCII; | 51 using base::UTF16ToASCII; |
| 52 using base::WideToUTF16; | 52 using base::WideToUTF16; |
| 53 | 53 |
| 54 namespace autofill { | 54 namespace autofill { |
| 55 | 55 |
| 56 // TODO(bondd): PdmChangeWaiter in autofill_uitest_util.cc is a replacement for |
| 57 // this class. Remove this class and use helper functions in that file instead. |
| 56 class WindowedPersonalDataManagerObserver | 58 class WindowedPersonalDataManagerObserver |
| 57 : public PersonalDataManagerObserver, | 59 : public PersonalDataManagerObserver, |
| 58 public infobars::InfoBarManager::Observer { | 60 public infobars::InfoBarManager::Observer { |
| 59 public: | 61 public: |
| 60 explicit WindowedPersonalDataManagerObserver(Browser* browser) | 62 explicit WindowedPersonalDataManagerObserver(Browser* browser) |
| 61 : alerted_(false), | 63 : alerted_(false), |
| 62 has_run_message_loop_(false), | 64 has_run_message_loop_(false), |
| 63 browser_(browser), | 65 browser_(browser), |
| 64 infobar_service_(InfoBarService::FromWebContents( | 66 infobar_service_(InfoBarService::FromWebContents( |
| 65 browser_->tab_strip_model()->GetActiveWebContents())) { | 67 browser_->tab_strip_model()->GetActiveWebContents())) { |
| (...skipping 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 IN_PROC_BROWSER_TEST_F(AutofillTest, | 840 IN_PROC_BROWSER_TEST_F(AutofillTest, |
| 839 DISABLED_MergeAggregatedDuplicatedProfiles) { | 841 DISABLED_MergeAggregatedDuplicatedProfiles) { |
| 840 int num_of_profiles = | 842 int num_of_profiles = |
| 841 AggregateProfilesIntoAutofillPrefs("dataset_duplicated_profiles.txt"); | 843 AggregateProfilesIntoAutofillPrefs("dataset_duplicated_profiles.txt"); |
| 842 | 844 |
| 843 ASSERT_GT(num_of_profiles, | 845 ASSERT_GT(num_of_profiles, |
| 844 static_cast<int>(personal_data_manager()->GetProfiles().size())); | 846 static_cast<int>(personal_data_manager()->GetProfiles().size())); |
| 845 } | 847 } |
| 846 | 848 |
| 847 } // namespace autofill | 849 } // namespace autofill |
| OLD | NEW |