sync: Add ControlPreference protobuf and supporting code

chrome/browser/sync/test_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/test_profile_sync_service.h"
 
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/sync_backend_host.h"
 #include "chrome/browser/sync/profile_sync_components_factory.h"
 #include "chrome/browser/sync/test/test_http_bridge_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "sync/internal_api/public/sessions/sync_session_snapshot.h"
 #include "sync/internal_api/public/test/test_user_share.h"
 #include "sync/internal_api/public/user_share.h"
 #include "sync/js/js_reply_handler.h"
 #include "sync/protocol/encryption.pb.h"
 #include "sync/syncable/directory.h"
 
 using syncer::InternalComponentsFactory;
 using syncer::ModelSafeRoutingInfo;
 using syncer::TestInternalComponentsFactory;
 using syncer::sessions::ModelNeutralState;
 using syncer::sessions::SyncSessionSnapshot;
 using syncer::sessions::SyncSourceInfo;
 using syncer::UserShare;
 using syncer::syncable::Directory;
-using syncer::NIGORI;
+using syncer::CONTROL_PREFERENCES;
 using syncer::DEVICE_INFO;
 using syncer::EXPERIMENTS;
+using syncer::NIGORI;
 
 namespace browser_sync {
 
 SyncBackendHostForProfileSyncTest::SyncBackendHostForProfileSyncTest(
     Profile* profile,
     const base::WeakPtr<SyncPrefs>& sync_prefs,
     const base::WeakPtr<InvalidatorStorage>& invalidator_storage,
     syncer::TestIdFactory& id_factory,
     base::Closure& callback,
     bool set_initial_sync_ended_on_init,
@@ skipping 87 matching lines @@
 
   // Pretend we downloaded initial updates and set initial sync ended bits
   // if we were asked to.
   if (set_initial_sync_ended_on_init_) {
     UserShare* user_share = GetUserShare();
     Directory* directory = user_share->directory.get();
 
     if (!directory->InitialSyncEndedForType(NIGORI)) {
       syncer::TestUserShare::CreateRoot(NIGORI, user_share);
 
-      // A side effect of adding the NIGORI mode (normally done by the
+      // A side effect of adding the NIGORI node (normally done by the
       // syncer) is a decryption attempt, which will fail the first time.
     }
 
     if (!directory->InitialSyncEndedForType(DEVICE_INFO)) {
       syncer::TestUserShare::CreateRoot(DEVICE_INFO, user_share);
     }
 
     if (!directory->InitialSyncEndedForType(EXPERIMENTS)) {
       syncer::TestUserShare::CreateRoot(EXPERIMENTS, user_share);
     }
 
+    // XXX

[rlarocque, 2013/01/03 22:40:44]

If you want to leave a TODO, please use the standard format.

ie. "// TODO(albertb): Do this later..."

[albertb, 2013/01/07 19:00:01]

Done.

+    if (!directory->InitialSyncEndedForType(CONTROL_PREFERENCES)) {
+      syncer::TestUserShare::CreateRoot(CONTROL_PREFERENCES, user_share);
+    }
+
     restored_types = syncer::ModelTypeSet::All();
   }
 
   initial_download_closure_ = base::Bind(
       &SyncBackendHostForProfileSyncTest::ContinueInitialization,
       weak_ptr_factory_.GetWeakPtr(),
       js_backend,
       debug_info_listener,
       restored_types);
   if (fail_initial_download_) {
@@ skipping 121 matching lines @@
       profile(),
       sync_prefs_.AsWeakPtr(),
       invalidator_storage_.AsWeakPtr(),
       id_factory_,
       callback_,
       set_initial_sync_ended_on_init_,
       synchronous_backend_initialization_,
       fail_initial_download_,
       storage_option_));
 }