[Sync] Add a sanity integration test for USS.

components/sync/test/fake_server/permanent_entity.cc

 // Copyright 2014 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 "components/sync/test/fake_server/permanent_entity.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
@@ skipping 47 matching lines @@
   sync_pb::EntitySpecifics entity_specifics;
   AddDefaultFieldValue(model_type, &entity_specifics);
   return std::unique_ptr<FakeServerEntity>(new PermanentEntity(
       id, model_type, name, kRootParentTag, server_tag, entity_specifics));
 }
 
 // static
 std::unique_ptr<FakeServerEntity> PermanentEntity::CreateUpdatedNigoriEntity(
     const sync_pb::SyncEntity& client_entity,
     const FakeServerEntity& current_server_entity) {
-  ModelType model_type = current_server_entity.GetModelType();
+  ModelType model_type = current_server_entity.model_type();
   CHECK(model_type == syncer::NIGORI) << "This factory only supports NIGORI "
                                       << "entities.";
 
   return base::WrapUnique<FakeServerEntity>(new PermanentEntity(
-      current_server_entity.GetId(), model_type,
-      current_server_entity.GetName(), current_server_entity.GetParentId(),
+      current_server_entity.id(), model_type, current_server_entity.GetName(),
+      current_server_entity.GetParentId(),
       syncer::ModelTypeToRootTag(model_type), client_entity.specifics()));
 }
 
 PermanentEntity::PermanentEntity(const string& id,
                                  const ModelType& model_type,
                                  const string& name,
                                  const string& parent_id,
                                  const string& server_defined_unique_tag,
                                  const sync_pb::EntitySpecifics& specifics)
-    : FakeServerEntity(id, model_type, 0, name),
+    : FakeServerEntity(id, string(), model_type, 0, name),
       server_defined_unique_tag_(server_defined_unique_tag),
       parent_id_(parent_id) {
   SetSpecifics(specifics);
 }
 
 bool PermanentEntity::RequiresParentId() const {
   return true;
 }
 
 string PermanentEntity::GetParentId() const {
   return parent_id_;
 }
 
 void PermanentEntity::SerializeAsProto(sync_pb::SyncEntity* proto) const {
   FakeServerEntity::SerializeBaseProtoFields(proto);
   proto->set_server_defined_unique_tag(server_defined_unique_tag_);
 }
 
 bool PermanentEntity::IsFolder() const {
   return true;
 }
 
 bool PermanentEntity::IsPermanent() const {
   return true;
 }
 
 }  // namespace fake_server