sync: Add location info to unrecoverable error.

chrome/browser/sync/profile_sync_test_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_PROFILE_SYNC_TEST_UTIL_H_
 #define CHROME_BROWSER_SYNC_PROFILE_SYNC_TEST_UTIL_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 40 matching lines @@
 ACTION(QuitUIMessageLoop) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   MessageLoop::current()->Quit();
 }
 
 ACTION_P(InvokeTask, task) {
   if (task)
     task->Run();
 }
 
-template <class ModelAssociatorImpl>
-class TestModelAssociator : public ModelAssociatorImpl {
+class TestModelAssociatorHelper {
  public:
-  explicit TestModelAssociator(
-      ProfileSyncService* service,
-      browser_sync::UnrecoverableErrorHandler* error_handler)
-      : ModelAssociatorImpl(service, error_handler) {
-  }
-
-  virtual bool GetSyncIdForTaggedNode(const std::string& tag, int64* sync_id) {
+  template <class ModelAssociatorImpl>
+  bool GetSyncIdForTaggedNode(ModelAssociatorImpl* associator,
+                              const std::string& tag, int64* sync_id) {
     std::wstring tag_wide;
     if (!UTF8ToWide(tag.c_str(), tag.length(), &tag_wide)) {
       NOTREACHED() << "Unable to convert UTF8 to wide for string: " << tag;
       return false;
     }
 
     sync_api::WriteTransaction trans(
-        ModelAssociatorImpl::sync_service()->backend()->GetUserShareHandle());
+        associator->sync_service()->backend()->GetUserShareHandle());
     sync_api::ReadNode root(&trans);
     root.InitByRootLookup();
 
     // First, try to find a node with the title among the root's children.
     // This will be the case if we are testing model persistence, and
     // are reloading a sync repository created earlier in the test.
     int64 last_child_id = sync_api::kInvalidId;
     for (int64 id = root.GetFirstChildId(); id != sync_api::kInvalidId; /***/) {
       sync_api::ReadNode child(&trans);
       child.InitByIdLookup(id);
@@ skipping 14 matching lines @@
     sync_api::WriteNode node(&trans);
     // Create new fake tagged nodes at the end of the ordering.
     node.InitByCreation(ModelAssociatorImpl::model_type(), root, predecessor);
     node.SetIsFolder(true);
     node.SetTitle(tag_wide);
     node.SetExternalId(0);
     *sync_id = node.GetId();
     return true;
   }
 
-  ~TestModelAssociator() {}
+  ~TestModelAssociatorHelper() {}
 };
 
 class ProfileSyncServiceObserverMock : public ProfileSyncServiceObserver {
  public:
   MOCK_METHOD0(OnStateChanged, void());
 };
 
 class ThreadNotificationService
     : public base::RefCountedThreadSafe<ThreadNotificationService> {
  public:
@@ skipping 69 matching lines @@
                   const NotificationDetails& details) {
     NotificationService::current()->Notify(type, source, details);
     done_event_.Signal();
   }
 
   base::WaitableEvent done_event_;
   base::Thread* notify_thread_;
 };
 
 #endif  // CHROME_BROWSER_SYNC_PROFILE_SYNC_TEST_UTIL_H_