Added DataTypeController integration and UI surfacing for syncing Search Engines.

chrome/browser/sync/protocol/proto_value_conversions.cc

 // Copyright (c) 2011 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.
 
 // Keep this file in sync with the .proto files in this directory.
 
 #include "chrome/browser/sync/protocol/proto_value_conversions.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 256 matching lines @@
   SET_STR(favicon_url);
   SET_STR(url);
   SET_BOOL(safe_for_autoreplace);
   SET_STR(originating_url);
   SET_INT64(date_created);
   SET_STR(input_encodings);
   SET_BOOL(show_in_default_list);
   SET_STR(suggestions_url);
   SET_INT32(prepopulate_id);
   SET_BOOL(autogenerate_keyword);
-  SET_INT32(logo_id);
   SET_BOOL(created_by_policy);
   SET_STR(instant_url);
-  SET_INT64(id);
   SET_INT64(last_modified);
   SET_STR(sync_guid);
   return value;
 }
 
 DictionaryValue* SessionSpecificsToValue(
     const sync_pb::SessionSpecifics& proto) {
   DictionaryValue* value = new DictionaryValue();
   SET_STR(session_tag);
   SET(header, SessionHeaderToValue);
@@ skipping 47 matching lines @@
 #undef SET_BOOL
 #undef SET_BYTES
 #undef SET_INT32
 #undef SET_INT64
 #undef SET_INT64_REP
 #undef SET_STR
 
 #undef SET_EXTENSION
 
 }  // namespace browser_sync