sync: Add location info to unrecoverable error.

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2006-2008 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/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
@@ skipping 382 matching lines @@
     case syncable::TYPED_URLS:
       return prefs::kSyncTypedUrls;
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 // An invariant has been violated.  Transition to an error state where we try
 // to do as little work as possible, to avoid further corruption or crashes.
-void ProfileSyncService::OnUnrecoverableError() {
+void ProfileSyncService::OnUnrecoverableError(
+    const tracked_objects::Location& from_here,
+    const std::string& message) {
   unrecoverable_error_detected_ = true;
-  // TODO(sync) remove this unrecoverable_error_detected_ variable_ as it only
-  // affects ShouldPushChanges().
+  unrecoverable_error_message_ = message;
+  unrecoverable_error_location_.reset(
+      new tracked_objects::Location(from_here.function_name(),
+                                    from_here.file_name(),
+                                    from_here.line_number()));
 
   // Shut all data types down.
   if (data_type_manager_.get())
     data_type_manager_->Stop();
 
   // Tell the wizard so it can inform the user only if it is already open.
   wizard_.Step(SyncSetupWizard::FATAL_ERROR);
 
   FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
   LOG(ERROR) << "Unrecoverable error detected -- ProfileSyncService unusable.";
+  std::string location;
+  from_here.Write(true, true, &location);
+  LOG(ERROR) << location;
 
   if (WizardIsVisible()) {
     // We've hit an error in the middle of a startup process- shutdown all the
     // backend stuff, and then restart it, so we're in the same state as before.
     MessageLoop::current()->PostTask(FROM_HERE,
         scoped_runnable_method_factory_.NewRunnableMethod(
         &ProfileSyncService::Shutdown, true));
     MessageLoop::current()->PostTask(FROM_HERE,
         scoped_runnable_method_factory_.NewRunnableMethod(
         &ProfileSyncService::StartUp));
@@ skipping 244 matching lines @@
   switch (type.value) {
     case NotificationType::SYNC_CONFIGURE_START: {
       FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
       // TODO(sync): Maybe toast?
       break;
     }
     case NotificationType::SYNC_CONFIGURE_DONE: {
       DataTypeManager::ConfigureResult result =
           *(Details<DataTypeManager::ConfigureResult>(details).ptr());
       if (result != DataTypeManager::OK) {
-        OnUnrecoverableError();
+        OnUnrecoverableError(FROM_HERE, "Sync Configuration failed.");
         return;
       }
 
       // TODO(sync): Less wizard, more toast.
       wizard_.Step(SyncSetupWizard::DONE);
       FOR_EACH_OBSERVER(Observer, observers_, OnStateChanged());
       break;
     }
     default: {
       NOTREACHED();
@@ skipping 24 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }