| 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/guid.h" | 8 #include "base/guid.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/browser/autofill/autofill_common_test.h" | 12 #include "chrome/browser/autofill/autofill_common_test.h" |
| 13 #include "chrome/browser/autofill/autofill_metrics.h" | 13 #include "chrome/browser/autofill/autofill_metrics.h" |
| 14 #include "chrome/browser/autofill/autofill_profile.h" | 14 #include "chrome/browser/autofill/autofill_profile.h" |
| 15 #include "chrome/browser/autofill/form_structure.h" | 15 #include "chrome/browser/autofill/form_structure.h" |
| 16 #include "chrome/browser/autofill/personal_data_manager.h" | 16 #include "chrome/browser/autofill/personal_data_manager.h" |
| 17 #include "chrome/browser/autofill/personal_data_manager_observer.h" | 17 #include "chrome/browser/autofill/personal_data_manager_observer.h" |
| 18 #include "chrome/browser/password_manager/encryptor.h" | 18 #include "chrome/browser/password_manager/encryptor.h" |
| 19 #include "chrome/browser/webdata/web_data_service.h" | 19 #include "chrome/browser/webdata/web_data_service.h" |
| 20 #include "chrome/browser/webdata/web_data_service_factory.h" | 20 #include "chrome/browser/webdata/web_data_service_factory.h" |
| 21 #include "chrome/common/form_data.h" | |
| 22 #include "chrome/test/base/testing_browser_process.h" | 21 #include "chrome/test/base/testing_browser_process.h" |
| 23 #include "chrome/test/base/testing_profile.h" | 22 #include "chrome/test/base/testing_profile.h" |
| 23 #include "components/autofill/common/form_data.h" |
| 24 #include "content/public/browser/notification_details.h" | 24 #include "content/public/browser/notification_details.h" |
| 25 #include "content/public/browser/notification_registrar.h" | 25 #include "content/public/browser/notification_registrar.h" |
| 26 #include "content/public/browser/notification_source.h" | 26 #include "content/public/browser/notification_source.h" |
| 27 #include "content/public/browser/notification_types.h" | 27 #include "content/public/browser/notification_types.h" |
| 28 #include "content/public/test/mock_notification_observer.h" | 28 #include "content/public/test/mock_notification_observer.h" |
| 29 #include "content/public/test/test_browser_thread.h" | 29 #include "content/public/test/test_browser_thread.h" |
| 30 #include "testing/gmock/include/gmock/gmock.h" | 30 #include "testing/gmock/include/gmock/gmock.h" |
| 31 #include "testing/gtest/include/gtest/gtest.h" | 31 #include "testing/gtest/include/gtest/gtest.h" |
| 32 | 32 |
| 33 using content::BrowserThread; | 33 using content::BrowserThread; |
| (...skipping 1931 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1965 | 1965 |
| 1966 // Modify expected to include multi-valued fields. | 1966 // Modify expected to include multi-valued fields. |
| 1967 std::vector<string16> values; | 1967 std::vector<string16> values; |
| 1968 expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values); | 1968 expected.GetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, &values); |
| 1969 values.push_back(ASCIIToUTF16("(214) 555-1234")); | 1969 values.push_back(ASCIIToUTF16("(214) 555-1234")); |
| 1970 expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values); | 1970 expected.SetRawMultiInfo(PHONE_HOME_WHOLE_NUMBER, values); |
| 1971 | 1971 |
| 1972 ASSERT_EQ(1U, results2.size()); | 1972 ASSERT_EQ(1U, results2.size()); |
| 1973 EXPECT_EQ(0, expected.Compare(*results2[0])); | 1973 EXPECT_EQ(0, expected.Compare(*results2[0])); |
| 1974 } | 1974 } |
| OLD | NEW |