| Index: chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| index 9d8cbf312e7509a38639efa11f117935339f1461..3e73988e81430b7a247b3856e85013fdb5c68118 100644
|
| --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc
|
| @@ -624,7 +624,8 @@ class ProfileSyncServiceAutofillTest
|
|
|
| syncer::WriteNode node(&trans);
|
| std::string tag = AutocompleteSyncableService::KeyToTag(
|
| - UTF16ToUTF8(entry.key().name()), UTF16ToUTF8(entry.key().value()));
|
| + base::UTF16ToUTF8(entry.key().name()),
|
| + base::UTF16ToUTF8(entry.key().value()));
|
| syncer::WriteNode::InitUniqueByCreationResult result =
|
| node.InitUniqueByCreation(syncer::AUTOFILL, autofill_root, tag);
|
| if (result != syncer::WriteNode::INIT_SUCCESS)
|
| @@ -680,8 +681,8 @@ class ProfileSyncServiceAutofillTest
|
| const sync_pb::AutofillSpecifics& autofill(
|
| child_node.GetAutofillSpecifics());
|
| if (autofill.has_value()) {
|
| - AutofillKey key(UTF8ToUTF16(autofill.name()),
|
| - UTF8ToUTF16(autofill.value()));
|
| + AutofillKey key(base::UTF8ToUTF16(autofill.name()),
|
| + base::UTF8ToUTF16(autofill.value()));
|
| std::vector<base::Time> timestamps;
|
| int timestamps_count = autofill.usage_timestamp_size();
|
| for (int i = 0; i < timestamps_count; ++i) {
|
| @@ -748,7 +749,8 @@ class ProfileSyncServiceAutofillTest
|
| if (time_shift1 > 0)
|
| timestamps.push_back(base_time + TimeDelta::FromSeconds(time_shift1));
|
| return AutofillEntry(
|
| - AutofillKey(ASCIIToUTF16(name), ASCIIToUTF16(value)), timestamps);
|
| + AutofillKey(base::ASCIIToUTF16(name), base::ASCIIToUTF16(value)),
|
| + timestamps);
|
| }
|
|
|
| static AutofillEntry MakeAutofillEntry(const char* name,
|
| @@ -845,10 +847,11 @@ class FakeServerUpdater : public base::RefCountedThreadSafe<FakeServerUpdater> {
|
|
|
| // Create autofill protobuf.
|
| std::string tag = AutocompleteSyncableService::KeyToTag(
|
| - UTF16ToUTF8(entry_.key().name()), UTF16ToUTF8(entry_.key().value()));
|
| + base::UTF16ToUTF8(entry_.key().name()),
|
| + base::UTF16ToUTF8(entry_.key().value()));
|
| sync_pb::AutofillSpecifics new_autofill;
|
| - new_autofill.set_name(UTF16ToUTF8(entry_.key().name()));
|
| - new_autofill.set_value(UTF16ToUTF8(entry_.key().value()));
|
| + new_autofill.set_name(base::UTF16ToUTF8(entry_.key().name()));
|
| + new_autofill.set_value(base::UTF16ToUTF8(entry_.key().value()));
|
| const std::vector<base::Time>& ts(entry_.timestamps());
|
| for (std::vector<base::Time>::const_iterator timestamp = ts.begin();
|
| timestamp != ts.end(); ++timestamp) {
|
|
|