| Index: chrome/browser/sync/glue/autofill_change_processor2.cc
|
| diff --git a/chrome/browser/sync/glue/autofill_change_processor2.cc b/chrome/browser/sync/glue/autofill_change_processor2.cc
|
| index eb708091349b27bec9c81c95f756ba7741536265..ed7a177550b938fa8dbfca9abde746dea164fd8e 100644
|
| --- a/chrome/browser/sync/glue/autofill_change_processor2.cc
|
| +++ b/chrome/browser/sync/glue/autofill_change_processor2.cc
|
| @@ -473,12 +473,14 @@ void AutofillChangeProcessor2::ApplySyncAutofillProfileChange(
|
| AutoFillProfile* p = NULL;
|
| string16 label = UTF8ToUTF16(profile.label());
|
| if (!web_database_->GetAutoFillProfileForLabel(label, &p)) {
|
| - NOTREACHED() << "Couldn't retrieve autofill profile: " << label;
|
| + NOTREACHED() << "Couldn't retrieve autofill profile: "
|
| + << UTF16ToUTF8(label);
|
| return;
|
| }
|
| AutofillModelAssociator2::OverwriteProfileWithServerData(p, profile);
|
| if (!web_database_->UpdateAutoFillProfile(*p)) {
|
| - NOTREACHED() << "Couldn't update autofill profile: " << label;
|
| + NOTREACHED() << "Couldn't update autofill profile: " <<
|
| + UTF16ToUTF8(label);
|
| return;
|
| }
|
| delete p;
|
| @@ -497,11 +499,13 @@ void AutofillChangeProcessor2::ApplySyncAutofillProfileDelete(
|
| bool get_success = web_database_->GetAutoFillProfileForLabel(label, &ptr);
|
| scoped_ptr<AutoFillProfile> p(ptr);
|
| if (!get_success) {
|
| - NOTREACHED() << "Couldn't retrieve autofill profile: " << label;
|
| + NOTREACHED() << "Couldn't retrieve autofill profile: " << UTF16ToUTF8(
|
| + label);
|
| return;
|
| }
|
| if (!web_database_->RemoveAutoFillProfile(p->guid())) {
|
| - NOTREACHED() << "Couldn't remove autofill profile: " << label;
|
| + NOTREACHED() << "Couldn't remove autofill profile: " << UTF16ToUTF8(
|
| + label);
|
| return;
|
| }
|
| model_associator_->Disassociate(sync_id);
|
|
|