[Sync] - Implement isolated model association.

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2012 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 <cstddef>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 353 matching lines @@
   if (encryption_pending())
     return true;
   const syncable::ModelTypeSet preferred_types = GetPreferredDataTypes();
   const syncable::ModelTypeSet encrypted_types = GetEncryptedDataTypes();
   DCHECK(encrypted_types.Has(syncable::PASSWORDS));
   return !Intersection(preferred_types, encrypted_types).Empty();
 }
 
 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();
   }
 }
 
 void ProfileSyncService::OnSyncConfigureRetry() {
   // In platforms with auto start we would just wait for the
   // configure to finish. In other platforms we would throw
   // an unrecoverable error. The reason we do this is so that
   // the login dialog would show an error and the user would have
@@ skipping 1045 matching lines @@
       if (configure_status_ == DataTypeManager::RETRY) {
         OnSyncConfigureRetry();
         return;
       }
 
       // Handle unrecoverable error.
       if (configure_status_ != DataTypeManager::OK &&
           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 " +
           DataTypeManager::ConfigureStatusToString(configure_status_) +
           " during " + syncable::ModelTypeToString(error.type()) +
           ": " + error.message();
         LOG(ERROR) << "ProfileSyncService error: "
                    << message;
         OnUnrecoverableError(error.location(), message);
         return;
@@ skipping 206 matching lines @@
   // See http://stackoverflow.com/questions/6224121/is-new-this-myclass-undefined-behaviour-after-directly-calling-the-destru.
   ProfileSyncService* old_this = this;
   this->~ProfileSyncService();
   new(old_this) ProfileSyncService(
       new ProfileSyncComponentsFactoryImpl(profile,
                                            CommandLine::ForCurrentProcess()),
       profile,
       signin,
       behavior);
 }