sync: Add location info to unrecoverable error.

chrome/browser/sync/glue/password_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/password_model_associator.h"
 
 #include <set>
 
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/protocol/password_specifics.pb.h"
 #include "net/base/escape.h"
 #include "webkit/glue/password_form.h"
 
 namespace browser_sync {
 
 const char kPasswordTag[] = "google_chrome_passwords";
 
 PasswordModelAssociator::PasswordModelAssociator(
     ProfileSyncService* sync_service,
-    PasswordStore* password_store,
-    UnrecoverableErrorHandler* error_handler)
+    PasswordStore* password_store)
     : sync_service_(sync_service),
       password_store_(password_store),
-      error_handler_(error_handler),
       password_node_id_(sync_api::kInvalidId),
       abort_association_pending_(false),
       expected_loop_(MessageLoop::current()) {
   DCHECK(sync_service_);
   DCHECK(password_store_);
-  DCHECK(error_handler_);
 #if defined(OS_MACOSX)
   DCHECK(!ChromeThread::CurrentlyOn(ChromeThread::UI));
 #else
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
 #endif
 }
 
 bool PasswordModelAssociator::AssociateModels() {
   DCHECK(expected_loop_ == MessageLoop::current());
   {
@@ skipping 347 matching lines @@
 std::string PasswordModelAssociator::MakeTag(
                 const std::string& signon_realm,
                 const std::string& origin,
                 const std::string& action) {
   return EscapePath(signon_realm) + "|" +
          EscapePath(origin) + "|" +
          EscapePath(action);
 }
 
 }  // namespace browser_sync