[Sync] Add support for proxy types

sync/engine/build_commit_command.cc

 // Copyright 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 "sync/engine/build_commit_command.h"
 
 #include <limits>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 85 matching lines @@
     }
   }
 }
 
 void BuildCommitCommand::AddClientConfigParamsToMessage(
     SyncSession* session, sync_pb::CommitMessage* message) {
   const ModelSafeRoutingInfo& routing_info = session->routing_info();
   sync_pb::ClientConfigParams* config_params = message->mutable_config_params();
   for (std::map<ModelType, ModelSafeGroup>::const_iterator iter =
           routing_info.begin(); iter != routing_info.end(); ++iter) {
+    if (ProxyTypes().Has(iter->first))
+      continue;
     int field_number = GetSpecificsFieldNumberFromModelType(iter->first);
     config_params->mutable_enabled_type_ids()->Add(field_number);
   }
 }
 
 namespace {
 void SetEntrySpecifics(MutableEntry* meta_entry,
                        sync_pb::SyncEntity* sync_entry) {
   // Add the new style extension and the folder bit.
   sync_entry->mutable_specifics()->CopyFrom(meta_entry->Get(SPECIFICS));
@@ skipping 156 matching lines @@
   if (delta <= static_cast<uint64>(GetGap()*2))
     return lo + (static_cast<int64>(delta) + 7) / 8;  // Interpolate.
   else if (lo == GetFirstPosition())
     return hi - GetGap();  // Extend range just before successor.
   else
     return lo + GetGap();  // Use or extend range just after predecessor.
 }
 
 
 }  // namespace syncer