| 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/autofill/autofill_profile.h" |   20 #include "chrome/browser/autofill/autofill_profile.h" | 
|   21 #include "chrome/browser/autofill/credit_card.h" |   21 #include "chrome/browser/autofill/credit_card.h" | 
|   22 #include "chrome/browser/webdata/autofill_change.h" |   22 #include "chrome/browser/webdata/autofill_change.h" | 
|   23 #include "chrome/browser/webdata/autofill_entry.h" |   23 #include "chrome/browser/webdata/autofill_entry.h" | 
|   24 #include "chrome/browser/webdata/web_data_service.h" |   24 #include "chrome/browser/webdata/web_data_service.h" | 
|   25 #include "chrome/browser/webdata/web_data_service_test_util.h" |   25 #include "chrome/browser/webdata/web_data_service_test_util.h" | 
|   26 #include "chrome/common/chrome_notification_types.h" |   26 #include "chrome/common/chrome_notification_types.h" | 
|   27 #include "chrome/common/chrome_paths.h" |   27 #include "chrome/common/chrome_paths.h" | 
|   28 #include "chrome/common/form_field_data.h" |  | 
|   29 #include "chrome/test/base/thread_observer_helper.h" |   28 #include "chrome/test/base/thread_observer_helper.h" | 
 |   29 #include "components/autofill/common/form_field_data.h" | 
|   30 #include "content/public/browser/notification_details.h" |   30 #include "content/public/browser/notification_details.h" | 
|   31 #include "content/public/browser/notification_service.h" |   31 #include "content/public/browser/notification_service.h" | 
|   32 #include "content/public/test/test_browser_thread.h" |   32 #include "content/public/test/test_browser_thread.h" | 
|   33 #include "testing/gmock/include/gmock/gmock.h" |   33 #include "testing/gmock/include/gmock/gmock.h" | 
|   34 #include "testing/gtest/include/gtest/gtest.h" |   34 #include "testing/gtest/include/gtest/gtest.h" | 
|   35  |   35  | 
|   36 using base::Time; |   36 using base::Time; | 
|   37 using base::TimeDelta; |   37 using base::TimeDelta; | 
|   38 using base::WaitableEvent; |   38 using base::WaitableEvent; | 
|   39 using content::BrowserThread; |   39 using content::BrowserThread; | 
| (...skipping 551 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  591   ASSERT_EQ(0U, profile_consumer2.result().size()); |  591   ASSERT_EQ(0U, profile_consumer2.result().size()); | 
|  592  |  592  | 
|  593   // Check that the credit card was removed. |  593   // Check that the credit card was removed. | 
|  594   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > |  594   AutofillWebDataServiceConsumer<std::vector<CreditCard*> > | 
|  595       card_consumer2; |  595       card_consumer2; | 
|  596   handle2 = wds_->GetCreditCards(&card_consumer2); |  596   handle2 = wds_->GetCreditCards(&card_consumer2); | 
|  597   MessageLoop::current()->Run(); |  597   MessageLoop::current()->Run(); | 
|  598   EXPECT_EQ(handle2, card_consumer2.handle()); |  598   EXPECT_EQ(handle2, card_consumer2.handle()); | 
|  599   ASSERT_EQ(0U, card_consumer2.result().size()); |  599   ASSERT_EQ(0U, card_consumer2.result().size()); | 
|  600 } |  600 } | 
| OLD | NEW |