Remove syncproto.h

sync/syncable/model_type.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 "sync/internal_api/public/base/model_type.h"
 
 #include "base/string_split.h"
 #include "base/values.h"
-#include "sync/engine/syncproto.h"
 #include "sync/protocol/app_notification_specifics.pb.h"
 #include "sync/protocol/app_setting_specifics.pb.h"
 #include "sync/protocol/app_specifics.pb.h"
 #include "sync/protocol/autofill_specifics.pb.h"
 #include "sync/protocol/bookmark_specifics.pb.h"
 #include "sync/protocol/extension_setting_specifics.pb.h"
 #include "sync/protocol/extension_specifics.pb.h"
 #include "sync/protocol/nigori_specifics.pb.h"
 #include "sync/protocol/password_specifics.pb.h"
 #include "sync/protocol/preference_specifics.pb.h"
 #include "sync/protocol/search_engine_specifics.pb.h"
 #include "sync/protocol/session_specifics.pb.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/theme_specifics.pb.h"
 #include "sync/protocol/typed_url_specifics.pb.h"
+#include "sync/syncable/syncable_proto_util.h"
 
 namespace syncer {
 
 void AddDefaultFieldValue(ModelType datatype,
                           sync_pb::EntitySpecifics* specifics) {
   switch (datatype) {
     case BOOKMARKS:
       specifics->mutable_bookmark();
       break;
     case PASSWORDS:
@@ skipping 104 matching lines @@
       NOTREACHED() << "No known extension for model type.";
       return 0;
   }
   NOTREACHED() << "Needed for linux_keep_shadow_stacks because of "
                << "http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20681";
   return 0;
 }
 
 // Note: keep this consistent with GetModelType in syncable.cc!
 ModelType GetModelType(const sync_pb::SyncEntity& sync_pb_entity) {
-  const syncer::SyncEntity& sync_entity =
-      static_cast<const syncer::SyncEntity&>(sync_pb_entity);
-  DCHECK(!sync_entity.id().IsRoot());  // Root shouldn't ever go over the wire.
+  const sync_pb::SyncEntity& sync_entity =
+      static_cast<const sync_pb::SyncEntity&>(sync_pb_entity);

[akalin, 2012/07/11 01:42:22]

static cast

[rlarocque, 2012/07/11 19:22:16]

Done.

+  DCHECK(!IsRoot(sync_entity));  // Root shouldn't ever go over the wire.
 
   if (sync_entity.deleted())
     return UNSPECIFIED;
 
   // Backwards compatibility with old (pre-specifics) protocol.
   if (sync_entity.has_bookmarkdata())
     return BOOKMARKS;
 
   ModelType specifics_type = GetModelTypeFromSpecifics(sync_entity.specifics());
   if (specifics_type != UNSPECIFIED)
     return specifics_type;
 
   // Loose check for server-created top-level folders that aren't
   // bound to a particular model type.
   if (!sync_entity.server_defined_unique_tag().empty() &&
-      sync_entity.IsFolder()) {
+      IsFolder(sync_entity)) {
     return TOP_LEVEL_FOLDER;
   }
 
   // This is an item of a datatype we can't understand. Maybe it's
   // from the future?  Either we mis-encoded the object, or the
   // server sent us entries it shouldn't have.
   NOTREACHED() << "Unknown datatype in sync proto.";
   return UNSPECIFIED;
 }
 
@@ skipping 355 matching lines @@
     *model_type = UNSPECIFIED;
     return false;
   }
 }
 
 bool IsRealDataType(ModelType model_type) {
   return model_type >= FIRST_REAL_MODEL_TYPE && model_type < MODEL_TYPE_COUNT;
 }
 
 }  // namespace syncer