sync: Add location info to unrecoverable error.

chrome/browser/sync/glue/autofill_model_associator.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_model_associator.h"
 
 #include <vector>
 
 #include "base/task.h"
 #include "base/time.h"
@@ skipping 14 matching lines @@
 
 const char kAutofillTag[] = "google_chrome_autofill";
 const char kAutofillEntryNamespaceTag[] = "autofill_entry|";
 const char kAutofillProfileNamespaceTag[] = "autofill_profile|";
 
 static const int kMaxNumAttemptsToFindUniqueLabel = 100;
 
 AutofillModelAssociator::AutofillModelAssociator(
     ProfileSyncService* sync_service,
     WebDatabase* web_database,
-    PersonalDataManager* personal_data,
-    UnrecoverableErrorHandler* error_handler)
+    PersonalDataManager* personal_data)
     : sync_service_(sync_service),
       web_database_(web_database),
       personal_data_(personal_data),
-      error_handler_(error_handler),
       autofill_node_id_(sync_api::kInvalidId),
       abort_association_pending_(false) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
   DCHECK(sync_service_);
   DCHECK(web_database_);
-  DCHECK(error_handler_);
   DCHECK(personal_data_);
 }
 
 AutofillModelAssociator::~AutofillModelAssociator() {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
 }
 
 bool AutofillModelAssociator::TraverseAndAssociateChromeAutofillEntries(
     sync_api::WriteTransaction* write_trans,
     const sync_api::ReadNode& autofill_root,
@@ skipping 450 matching lines @@
   diff = MergeField(p, EMAIL_ADDRESS, s.email_address()) || diff;
   diff = MergeField(p, COMPANY_NAME, s.company_name()) || diff;
   diff = MergeField(p, PHONE_FAX_WHOLE_NUMBER, s.phone_fax_whole_number())
       || diff;
   diff = MergeField(p, PHONE_HOME_WHOLE_NUMBER, s.phone_home_whole_number())
       || diff;
   return diff;
 }
 
 }  // namespace browser_sync