sync: Add location info to unrecoverable error.

chrome/browser/sync/profile_sync_service_preference_unittest.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 "base/json/json_reader.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/preference_change_processor.h"
 #include "chrome/browser/sync/glue/preference_data_type_controller.h"
 #include "chrome/browser/sync/glue/preference_model_associator.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
@@ skipping 11 matching lines @@
 using base::JSONReader;
 using browser_sync::PreferenceChangeProcessor;
 using browser_sync::PreferenceDataTypeController;
 using browser_sync::PreferenceModelAssociator;
 using browser_sync::SyncBackendHost;
 using browser_sync::SyncBackendHostMock;
 using sync_api::SyncManager;
 using testing::_;
 using testing::Return;
 
+class TestPreferenceModelAssociator : public PreferenceModelAssociator {
+ public:
+  TestPreferenceModelAssociator(ProfileSyncService* service)
+    : PreferenceModelAssociator(service),
+      helper_(new TestModelAssociatorHelper()) {
+  }
+  virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id) {
+    return helper_->GetSyncIdForTaggedNode(this, tag, sync_id);
+  }
+ private:
+  scoped_ptr<TestModelAssociatorHelper> helper_;
+};
+
 class ProfileSyncServicePreferenceTest : public testing::Test {
  protected:
   ProfileSyncServicePreferenceTest()
       : ui_thread_(ChromeThread::UI, &message_loop_) {
   }
 
   virtual void SetUp() {
     profile_.reset(new TestingProfile());
     profile_->set_has_history_service(true);
   }
 
   virtual void TearDown() {
     service_.reset();
     profile_.reset();
     MessageLoop::current()->RunAllPending();
   }
 
   void StartSyncService() {
     if (!service_.get()) {
       service_.reset(new TestProfileSyncService(&factory_,
                                                 profile_.get(),
                                                 false,
                                                 true));
 
       // Register the preference data type.
-      model_associator_ =
-          new TestModelAssociator<PreferenceModelAssociator>(service_.get(),
-                                                             service_.get());
+      model_associator_ = new TestPreferenceModelAssociator(service_.get());
       change_processor_ = new PreferenceChangeProcessor(model_associator_,
                                                         service_.get());
       EXPECT_CALL(factory_, CreatePreferenceSyncComponents(_, _)).
           WillOnce(Return(ProfileSyncFactory::SyncComponents(
               model_associator_, change_processor_)));
       EXPECT_CALL(factory_, CreateDataTypeManager(_, _)).
           WillOnce(MakeDataTypeManager(&backend_mock_));
 
       service_->RegisterDataTypeController(
           new PreferenceDataTypeController(&factory_,
@@ skipping 101 matching lines @@
   scoped_ptr<SyncManager::ChangeRecord> record(
       SetSyncedValue(prefs::kHomePage, *expected));
   {
     sync_api::WriteTransaction trans(backend()->GetUserShareHandle());
     change_processor_->ApplyChangesFromSyncModel(&trans, record.get(), 1);
   }
 
   const Value& actual = GetPreferenceValue(prefs::kHomePage);
   ASSERT_TRUE(expected->Equals(&actual));
 }