Rest of the autofill work.

chrome/browser/sync/glue/autofill_change_processor2.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/glue/autofill_change_processor2.h"
 
 #include <string>
 #include <vector>
 
 #include "base/string_util.h"
@@ skipping 454 matching lines @@
       model_associator_->Associate(&tag, sync_id);
       if (!web_database_->AddAutoFillProfile(*p.get())) {
         NOTREACHED() << "Couldn't add autofill profile: " << profile.label();
         return;
       }
       break;
     }
     case sync_api::SyncManager::ChangeRecord::ACTION_UPDATE: {
       AutoFillProfile* p = NULL;
       string16 label = UTF8ToUTF16(profile.label());
       if (!web_database_->GetAutoFillProfileForLabel(label, &p)) {

[lipalani, 2010/12/09 19:45:25]

check to make sure you are not conflicting with some one else's changes.

-        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;
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 void AutofillChangeProcessor2::ApplySyncAutofillProfileDelete(
     const sync_pb::AutofillProfileSpecifics& profile,
     int64 sync_id) {
   string16 label(UTF8ToUTF16(profile.label()));
   AutoFillProfile* ptr = NULL;
   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);
 }
 
 void AutofillChangeProcessor2::StartImpl(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   observing_ = true;
 }
 
@@ skipping 60 matching lines @@
       AutoFillType(COMPANY_NAME))));
   s->set_phone_fax_whole_number(UTF16ToUTF8(profile.GetFieldText(
       AutoFillType(PHONE_FAX_WHOLE_NUMBER))));
   s->set_phone_home_whole_number(UTF16ToUTF8(profile.GetFieldText(
       AutoFillType(PHONE_HOME_WHOLE_NUMBER))));
   node->SetAutofillSpecifics(autofill);
 }
 
 }  // namespace browser_sync