sync: Add ControlPreference protobuf and supporting code

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 "chrome/browser/sync/glue/model_association_manager.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/debug/trace_event.h"
@@ skipping 12 matching lines @@
 // that in most cases types finish loading before this timeout.
 const int64 kDataTypeLoadWaitTimeInSeconds = 120;
 namespace {
 
 static const syncer::ModelType kStartOrder[] = {
   syncer::NIGORI,               //  Listed for completeness.
   syncer::DEVICE_INFO,          //  Listed for completeness.
   syncer::EXPERIMENTS,          //  Listed for completeness.
   syncer::BOOKMARKS,            //  UI thread datatypes.
   syncer::PREFERENCES,
+  syncer::PRIORITY_PREFERENCES,
   syncer::EXTENSIONS,
   syncer::APPS,
   syncer::THEMES,
   syncer::SEARCH_ENGINES,
   syncer::SESSIONS,
   syncer::APP_NOTIFICATIONS,
   syncer::AUTOFILL,             // Non-UI thread datatypes.
   syncer::AUTOFILL_PROFILE,
   syncer::EXTENSION_SETTINGS,
   syncer::APP_SETTINGS,
@@ skipping 502 matching lines @@
   }
   return result;
 }
 
 base::OneShotTimer<ModelAssociationManager>*
     ModelAssociationManager::GetTimerForTesting() {
   return &timer_;
 }
 
 }  // namespace browser_sync