OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/ref_counted.h" | 12 #include "base/ref_counted.h" |
13 #include "base/scoped_ptr.h" | 13 #include "base/scoped_ptr.h" |
14 #include "base/string16.h" | 14 #include "base/string16.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
16 #include "base/time.h" | 16 #include "base/time.h" |
| 17 #include "base/utf_string_conversions.h" |
17 #include "base/waitable_event.h" | 18 #include "base/waitable_event.h" |
18 #include "chrome/browser/autofill/autofill_profile.h" | 19 #include "chrome/browser/autofill/autofill_profile.h" |
19 #include "chrome/browser/autofill/credit_card.h" | 20 #include "chrome/browser/autofill/credit_card.h" |
20 #include "chrome/browser/chrome_thread.h" | 21 #include "chrome/browser/chrome_thread.h" |
21 #include "chrome/browser/webdata/autofill_change.h" | 22 #include "chrome/browser/webdata/autofill_change.h" |
22 #include "chrome/browser/webdata/autofill_entry.h" | 23 #include "chrome/browser/webdata/autofill_entry.h" |
23 #include "chrome/browser/webdata/web_data_service.h" | 24 #include "chrome/browser/webdata/web_data_service.h" |
24 #include "chrome/browser/webdata/web_data_service_test_util.h" | 25 #include "chrome/browser/webdata/web_data_service_test_util.h" |
25 #include "chrome/common/chrome_paths.h" | 26 #include "chrome/common/chrome_paths.h" |
26 #include "chrome/common/notification_details.h" | 27 #include "chrome/common/notification_details.h" |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 *observer_helper_->observer(), | 377 *observer_helper_->observer(), |
377 Observe(NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED), | 378 Observe(NotificationType(NotificationType::AUTOFILL_CREDIT_CARD_CHANGED), |
378 Source<WebDataService>(wds_.get()), | 379 Source<WebDataService>(wds_.get()), |
379 Property(&Details<const AutofillCreditCardChange>::ptr, | 380 Property(&Details<const AutofillCreditCardChange>::ptr, |
380 Pointee(expected_change)))). | 381 Pointee(expected_change)))). |
381 WillOnce(SignalEvent(&done_event_)); | 382 WillOnce(SignalEvent(&done_event_)); |
382 | 383 |
383 wds_->UpdateCreditCard(card1_delta); | 384 wds_->UpdateCreditCard(card1_delta); |
384 done_event_.TimedWait(test_timeout_); | 385 done_event_.TimedWait(test_timeout_); |
385 } | 386 } |
OLD | NEW |