Reland 87645 with clang fixes.

chrome/browser/sync/backend_migrator.cc

Index: chrome/browser/sync/backend_migrator.cc
diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc
index 4d8550f2e683dbea30f0f6bf1db15d6be3a87d5e..cc0b613349a28490dd7553b9224028fee2e22e66 100644
--- a/chrome/browser/sync/backend_migrator.cc
+++ b/chrome/browser/sync/backend_migrator.cc
@@ -121,9 +121,8 @@ void BackendMigrator::Observe(int type,
   if (state_ == IDLE)
     return;
 
-  DataTypeManager::ConfigureResultWithErrorLocation* result =
-      Details<DataTypeManager::ConfigureResultWithErrorLocation>(
-          details).ptr();
+  const DataTypeManager::ConfigureResult* result =
+      Details<DataTypeManager::ConfigureResult>(details).ptr();
 
   ModelTypeSet intersection;
   std::set_intersection(result->requested_types.begin(),
@@ -151,7 +150,7 @@ void BackendMigrator::Observe(int type,
     return;
   }
 
-  if (result->result != DataTypeManager::OK) {
+  if (result->status != DataTypeManager::OK) {
     // If this fails, and we're disabling types, a type may or may not be
     // disabled until the user restarts the browser.  If this wasn't an abort,
     // any failure will be reported as an unrecoverable error to the UI. If it