| 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 #include <vector> | 6 #include <vector> |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
| 10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "base/memory/scoped_vector.h" | 12 #include "base/memory/scoped_vector.h" |
| 13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
| 14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 15 #include "base/string16.h" | 15 #include "base/string16.h" |
| 16 #include "base/string_util.h" | 16 #include "base/string_util.h" |
| 17 #include "base/synchronization/waitable_event.h" | 17 #include "base/synchronization/waitable_event.h" |
| 18 #include "base/time.h" | 18 #include "base/time.h" |
| 19 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
| 20 #include "chrome/browser/webdata/autofill_change.h" | 20 #include "chrome/browser/webdata/autofill_change.h" |
| 21 #include "chrome/browser/webdata/autofill_entry.h" | 21 #include "chrome/browser/webdata/autofill_entry.h" |
| 22 #include "chrome/browser/webdata/autofill_table.h" | 22 #include "chrome/browser/webdata/autofill_table.h" |
| 23 #include "chrome/browser/webdata/autofill_web_data_service_impl.h" | 23 #include "chrome/browser/webdata/autofill_web_data_service.h" |
| 24 #include "chrome/browser/webdata/web_data_service_test_util.h" | 24 #include "chrome/browser/webdata/web_data_service_test_util.h" |
| 25 #include "chrome/browser/webdata/web_database_service.h" | 25 #include "chrome/browser/webdata/web_database_service.h" |
| 26 #include "chrome/common/chrome_notification_types.h" | 26 #include "chrome/common/chrome_notification_types.h" |
| 27 #include "chrome/test/base/thread_observer_helper.h" | 27 #include "chrome/test/base/thread_observer_helper.h" |
| 28 #include "components/autofill/browser/autofill_profile.h" | 28 #include "components/autofill/browser/autofill_profile.h" |
| 29 #include "components/autofill/browser/credit_card.h" | 29 #include "components/autofill/browser/credit_card.h" |
| 30 #include "components/autofill/common/form_field_data.h" | 30 #include "components/autofill/common/form_field_data.h" |
| 31 #include "content/public/browser/notification_details.h" | 31 #include "content/public/browser/notification_details.h" |
| 32 #include "content/public/browser/notification_service.h" | 32 #include "content/public/browser/notification_service.h" |
| 33 #include "content/public/test/test_browser_thread.h" | 33 #include "content/public/test/test_browser_thread.h" |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 virtual void SetUp() { | 76 virtual void SetUp() { |
| 77 db_thread_.Start(); | 77 db_thread_.Start(); |
| 78 | 78 |
| 79 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); | 79 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); |
| 80 base::FilePath path = temp_dir_.path().AppendASCII("TestWebDB"); | 80 base::FilePath path = temp_dir_.path().AppendASCII("TestWebDB"); |
| 81 | 81 |
| 82 wdbs_ = new WebDatabaseService(path); | 82 wdbs_ = new WebDatabaseService(path); |
| 83 wdbs_->AddTable(scoped_ptr<WebDatabaseTable>(new AutofillTable())); | 83 wdbs_->AddTable(scoped_ptr<WebDatabaseTable>(new AutofillTable())); |
| 84 wdbs_->LoadDatabase(WebDatabaseService::InitCallback()); | 84 wdbs_->LoadDatabase(WebDatabaseService::InitCallback()); |
| 85 | 85 |
| 86 wds_ = new AutofillWebDataServiceImpl(wdbs_, | 86 wds_ = new AutofillWebDataService(wdbs_, |
| 87 WebDataServiceBase::ProfileErrorCallback()); | 87 WebDataServiceBase::ProfileErrorCallback()); |
| 88 wds_->Init(); | 88 wds_->Init(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 virtual void TearDown() { | 91 virtual void TearDown() { |
| 92 wds_->ShutdownOnUIThread(); | 92 wds_->ShutdownOnUIThread(); |
| 93 wdbs_->ShutdownDatabase(); | 93 wdbs_->ShutdownDatabase(); |
| 94 wds_ = NULL; | 94 wds_ = NULL; |
| 95 wdbs_ = NULL; | 95 wdbs_ = NULL; |
| 96 WaitForDatabaseThread(); | 96 WaitForDatabaseThread(); |
| (...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 EXPECT_EQ(handle2, profile_consumer2.handle()); | 550 EXPECT_EQ(handle2, profile_consumer2.handle()); |
| 551 ASSERT_EQ(0U, profile_consumer2.result().size()); | 551 ASSERT_EQ(0U, profile_consumer2.result().size()); |
| 552 | 552 |
| 553 // Check that the credit card was removed. | 553 // Check that the credit card was removed. |
| 554 AutofillWebDataServiceConsumer<std::vector<CreditCard*> > card_consumer2; | 554 AutofillWebDataServiceConsumer<std::vector<CreditCard*> > card_consumer2; |
| 555 handle2 = wds_->GetCreditCards(&card_consumer2); | 555 handle2 = wds_->GetCreditCards(&card_consumer2); |
| 556 MessageLoop::current()->Run(); | 556 MessageLoop::current()->Run(); |
| 557 EXPECT_EQ(handle2, card_consumer2.handle()); | 557 EXPECT_EQ(handle2, card_consumer2.handle()); |
| 558 ASSERT_EQ(0U, card_consumer2.result().size()); | 558 ASSERT_EQ(0U, card_consumer2.result().size()); |
| 559 } | 559 } |
| OLD | NEW |