[Sync] Rename DataTypeState to ModelTypeState.

components/sync/device_info/device_info_service.cc

 // Copyright 2015 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/device_info/device_info_service.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "components/sync/api/entity_change.h"
 #include "components/sync/api/metadata_batch.h"
 #include "components/sync/api/sync_error.h"
 #include "components/sync/base/time.h"
 #include "components/sync/core/data_batch_impl.h"
 #include "components/sync/device_info/device_info_util.h"
-#include "components/sync/protocol/data_type_state.pb.h"
+#include "components/sync/protocol/model_type_state.pb.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace syncer {
 
 using base::Time;
 using base::TimeDelta;
-using sync_pb::DataTypeState;
 using sync_pb::DeviceInfoSpecifics;
 using sync_pb::EntitySpecifics;
+using sync_pb::ModelTypeState;
 
 using Record = ModelTypeStore::Record;
 using RecordList = ModelTypeStore::RecordList;
 using Result = ModelTypeStore::Result;
 using WriteBatch = ModelTypeStore::WriteBatch;
 
 DeviceInfoService::DeviceInfoService(
     LocalDeviceInfoProvider* local_device_info_provider,
     const StoreFactoryFunction& callback,
     const ChangeProcessorFactory& change_processor_factory)
@@ skipping 338 matching lines @@
   // is created later.
   has_metadata_loaded_ = true;
 
   if (!change_processor()) {
     // This means we haven't been told to start syncing and we don't have any
     // local metadata.
     return;
   }
 
   std::unique_ptr<MetadataBatch> batch(new MetadataBatch());
-  DataTypeState state;
+  ModelTypeState state;
   if (state.ParseFromString(global_metadata)) {
-    batch->SetDataTypeState(state);
+    batch->SetModelTypeState(state);
   } else {
     // TODO(skym): How bad is this scenario? We may be able to just give an
     // empty batch to the processor and we'll treat corrupted data type state
     // as no data type state at all. The question is do we want to add any of
     // the entity metadata to the batch or completely skip that step? We're
     // going to have to perform a merge shortly. Does this decision/logic even
     // belong in this service?
     change_processor()->OnMetadataLoaded(
         change_processor()->CreateAndUploadError(
             FROM_HERE, "Failed to deserialize global metadata."),
@@ skipping 113 matching lines @@
 Time DeviceInfoService::GetLastUpdateTime(
     const DeviceInfoSpecifics& specifics) {
   if (specifics.has_last_updated_timestamp()) {
     return ProtoTimeToTime(specifics.last_updated_timestamp());
   } else {
     return Time();
   }
 }
 
 }  // namespace syncer