[Sync] Fix error handling during startup scenarios

components/sync_driver/model_association_manager.cc

 // Copyright 2014 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 "components/sync_driver/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/debug/trace_event.h"
@@ skipping 270 matching lines @@
   ResetForNextAssociation();
 
   state_ = IDLE;
 }
 
 void ModelAssociationManager::ModelLoadCallback(syncer::ModelType type,
                                                 syncer::SyncError error) {
   DVLOG(1) << "ModelAssociationManager: ModelLoadCallback for "
       << syncer::ModelTypeToString(type);
 
-  // This happens when slow loading type is disabled by new configuration.
-  if (!desired_types_.Has(type))
-    return;
-
-  DCHECK(!loaded_types_.Has(type));
   if (error.IsSet()) {
     syncer::SyncMergeResult local_merge_result(type);
     local_merge_result.set_error(error);
     TypeStartCallback(type,
                       base::TimeTicks::Now(),
                       DataTypeController::ASSOCIATION_FAILED,
                       local_merge_result,
                       syncer::SyncMergeResult(type));
     return;
   }
 
+  // This happens when slow loading type is disabled by new configuration.
+  if (!desired_types_.Has(type))
+    return;
+
+  DCHECK(!loaded_types_.Has(type));
   loaded_types_.Put(type);
   if (associating_types_.Has(type)) {
     DataTypeController* dtc = controllers_->find(type)->second.get();
     dtc->StartAssociating(
         base::Bind(&ModelAssociationManager::TypeStartCallback,
                    weak_ptr_factory_.GetWeakPtr(),
                    type, base::TimeTicks::Now()));
   }
 }
 
@@ skipping 91 matching lines @@
 
   delegate_->OnModelAssociationDone(result);
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace sync_driver