| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| 11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
| 12 #include "chrome/browser/autofill/autofill_profile.h" | 12 #include "chrome/browser/autofill/autofill_profile.h" |
| 13 #include "chrome/browser/autofill/autofill_type.h" | 13 #include "chrome/browser/autofill/autofill_type.h" |
| 14 #include "chrome/browser/autofill/credit_card.h" | 14 #include "chrome/browser/autofill/credit_card.h" |
| 15 #include "chrome/browser/password_manager/encryptor.h" | 15 #include "chrome/browser/password_manager/encryptor.h" |
| 16 #include "chrome/browser/webdata/autofill_change.h" | 16 #include "chrome/browser/webdata/autofill_change.h" |
| 17 #include "chrome/browser/webdata/autofill_entry.h" | 17 #include "chrome/browser/webdata/autofill_entry.h" |
| 18 #include "chrome/browser/webdata/autofill_table.h" | 18 #include "chrome/browser/webdata/autofill_table.h" |
| 19 #include "chrome/browser/webdata/web_database.h" | 19 #include "chrome/browser/webdata/web_database.h" |
| 20 #include "chrome/common/chrome_paths.h" | 20 #include "chrome/common/chrome_paths.h" |
| 21 #include "chrome/common/guid.h" | 21 #include "chrome/common/guid.h" |
| 22 #include "chrome/test/base/testing_browser_process_test.h" | |
| 23 #include "sql/statement.h" | 22 #include "sql/statement.h" |
| 24 #include "testing/gtest/include/gtest/gtest.h" | 23 #include "testing/gtest/include/gtest/gtest.h" |
| 25 #include "webkit/glue/form_field.h" | 24 #include "webkit/glue/form_field.h" |
| 26 | 25 |
| 27 using base::Time; | 26 using base::Time; |
| 28 using base::TimeDelta; | 27 using base::TimeDelta; |
| 29 using webkit_glue::FormField; | 28 using webkit_glue::FormField; |
| 30 | 29 |
| 31 // So we can compare AutofillKeys with EXPECT_EQ(). | 30 // So we can compare AutofillKeys with EXPECT_EQ(). |
| 32 std::ostream& operator<<(std::ostream& os, const AutofillKey& key) { | 31 std::ostream& operator<<(std::ostream& os, const AutofillKey& key) { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 std::set<Time>::iterator it; | 74 std::set<Time>::iterator it; |
| 76 for (it = timestamps1.begin(); it != timestamps1.end(); it++) { | 75 for (it = timestamps1.begin(); it != timestamps1.end(); it++) { |
| 77 timestamps2.erase(*it); | 76 timestamps2.erase(*it); |
| 78 } | 77 } |
| 79 | 78 |
| 80 return !timestamps2.empty(); | 79 return !timestamps2.empty(); |
| 81 } | 80 } |
| 82 | 81 |
| 83 } // anonymous namespace | 82 } // anonymous namespace |
| 84 | 83 |
| 85 class AutofillTableTest : public TestingBrowserProcessTest { | 84 class AutofillTableTest : public testing::Test { |
| 86 public: | 85 public: |
| 87 AutofillTableTest() {} | 86 AutofillTableTest() {} |
| 88 virtual ~AutofillTableTest() {} | 87 virtual ~AutofillTableTest() {} |
| 89 | 88 |
| 90 protected: | 89 protected: |
| 91 typedef std::vector<AutofillChange> AutofillChangeList; | 90 typedef std::vector<AutofillChange> AutofillChangeList; |
| 92 typedef std::set<AutofillEntry, | 91 typedef std::set<AutofillEntry, |
| 93 bool (*)(const AutofillEntry&, const AutofillEntry&)> AutofillEntrySet; | 92 bool (*)(const AutofillEntry&, const AutofillEntry&)> AutofillEntrySet; |
| 94 typedef std::set<AutofillEntry, bool (*)(const AutofillEntry&, | 93 typedef std::set<AutofillEntry, bool (*)(const AutofillEntry&, |
| 95 const AutofillEntry&)>::iterator AutofillEntrySetIterator; | 94 const AutofillEntry&)>::iterator AutofillEntrySetIterator; |
| (...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1480 | 1479 |
| 1481 // make sure the lists of entries match | 1480 // make sure the lists of entries match |
| 1482 ASSERT_EQ(expected_entries.size(), entry_set.size()); | 1481 ASSERT_EQ(expected_entries.size(), entry_set.size()); |
| 1483 AutofillEntrySetIterator it; | 1482 AutofillEntrySetIterator it; |
| 1484 for (it = entry_set.begin(); it != entry_set.end(); it++) { | 1483 for (it = entry_set.begin(); it != entry_set.end(); it++) { |
| 1485 expected_entries.erase(*it); | 1484 expected_entries.erase(*it); |
| 1486 } | 1485 } |
| 1487 | 1486 |
| 1488 EXPECT_EQ(0U, expected_entries.size()); | 1487 EXPECT_EQ(0U, expected_entries.size()); |
| 1489 } | 1488 } |
| OLD | NEW |