[Sync] - Implement isolated model association.

chrome/browser/sync/profile_sync_service.cc

Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 3e81f9f4d293a787709f3584c1e0ca3f3d5dabc1..cefbc7c154e856e526fce02a37044c545da9006c 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -371,7 +371,7 @@ bool ProfileSyncService::IsEncryptedDatatypeEnabled() const {
 
 void ProfileSyncService::OnSyncConfigureDone(
     DataTypeManager::ConfigureResult result) {
-  if (failed_datatypes_handler_.UpdateFailedDatatypes(result.errors,
+  if (failed_datatypes_handler_.UpdateFailedDatatypes(result.failed_data_types,
           FailedDatatypesHandler::STARTUP)) {
     ReconfigureDatatypeManager();
   }
@@ -1437,8 +1437,8 @@ void ProfileSyncService::Observe(int type,
           configure_status_ != DataTypeManager::PARTIAL_SUCCESS) {
         // Something catastrophic had happened. We should only have one
         // error representing it.
-        DCHECK(result->errors.size() == 1);
-        SyncError error = result->errors.front();
+        DCHECK(result->failed_data_types.size() == 1);

[tim (not reviewing), 2012/05/21 23:18:57]

DCHECK_EQ

[lipalani1, 2012/05/22 01:23:58]

Done.

+        SyncError error = result->failed_data_types.front();
         DCHECK(error.IsSet());
         std::string message =
           "Sync configuration failed with status " +