[Sync] Associate UI datatypes before non-UI datatypes.

chrome/browser/sync/glue/model_association_manager.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 <algorithm>
 #include <functional>
 
 #include "base/debug/trace_event.h"
 
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 
 namespace browser_sync {
 // The amount of time we wait for a datatype to load. If the type has
 // not finished loading we move on to the next type. Once this type
 // finishes loading we will do a configure to associate this type. Note
 // that in most cases types finish loading before this timeout.
 const int64 kDataTypeLoadWaitTimeInSeconds = 120;
 namespace {
 
 static const syncable::ModelType kStartOrder[] = {
-  syncable::NIGORI,  //  Listed for completeness.
-  syncable::BOOKMARKS,
+  syncable::NIGORI,               //  Listed for completeness.
+  syncable::BOOKMARKS,            //  UI thread datatypes.
   syncable::PREFERENCES,
-  syncable::AUTOFILL,
-  syncable::AUTOFILL_PROFILE,
-  syncable::EXTENSION_SETTINGS,
   syncable::EXTENSIONS,
-  syncable::APP_SETTINGS,
   syncable::APPS,
   syncable::THEMES,
-  syncable::TYPED_URLS,
-  syncable::PASSWORDS,
   syncable::SEARCH_ENGINES,
   syncable::SESSIONS,
   syncable::APP_NOTIFICATIONS,
+  syncable::AUTOFILL,             // Non-UI thread datatypes.
+  syncable::AUTOFILL_PROFILE,
+  syncable::EXTENSION_SETTINGS,
+  syncable::APP_SETTINGS,
+  syncable::TYPED_URLS,
+  syncable::PASSWORDS,
 };
 
 COMPILE_ASSERT(arraysize(kStartOrder) ==
                syncable::MODEL_TYPE_COUNT - syncable::FIRST_REAL_MODEL_TYPE,
                kStartOrder_IncorrectSize);
 
 // Comparator used when sorting data type controllers.
 class SortComparator : public std::binary_function<DataTypeController*,
                                                    DataTypeController*,
                                                    bool> {
@@ skipping 430 matching lines @@
   return result;
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace browser_sync