[USS] Change the place where SharedModelTypeProcessor got created

components/sync_driver/device_info_service.h

 // 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.
 
 #ifndef COMPONENTS_SYNC_DRIVER_DEVICE_INFO_SERVICE_H_
 #define COMPONENTS_SYNC_DRIVER_DEVICE_INFO_SERVICE_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 28 matching lines @@
 // device info and associated sync metadata, applying/merging foreign changes,
 // and allows public read access.
 class DeviceInfoService : public syncer_v2::ModelTypeService,
                           public sync_driver::DeviceInfoTracker {
  public:
   typedef base::Callback<void(syncer_v2::ModelTypeStore::InitCallback callback)>
       StoreFactoryFunction;
 
   DeviceInfoService(
       sync_driver::LocalDeviceInfoProvider* local_device_info_provider,
-      const StoreFactoryFunction& callback);
+      const StoreFactoryFunction& callback,
+      const SharedProcessorFactory& shared_processor_factory);
   ~DeviceInfoService() override;
 
   // ModelTypeService implementation.
   scoped_ptr<syncer_v2::MetadataChangeList> CreateMetadataChangeList() override;
   syncer::SyncError MergeSyncData(
       scoped_ptr<syncer_v2::MetadataChangeList> metadata_change_list,
       syncer_v2::EntityDataMap entity_data_map) override;
   syncer::SyncError ApplySyncChanges(
       scoped_ptr<syncer_v2::MetadataChangeList> metadata_change_list,
       syncer_v2::EntityChangeList entity_changes) override;
   void GetData(ClientTagList client_tags, DataCallback callback) override;
   void GetAllData(DataCallback callback) override;
   std::string GetClientTag(const syncer_v2::EntityData& entity_data) override;
   void OnChangeProcessorSet() override;
 
   // DeviceInfoTracker implementation.
   bool IsSyncing() const override;
   scoped_ptr<sync_driver::DeviceInfo> GetDeviceInfo(
       const std::string& client_id) const override;
   ScopedVector<sync_driver::DeviceInfo> GetAllDeviceInfo() const override;
   void AddObserver(Observer* observer) override;
   void RemoveObserver(Observer* observer) override;
   int CountActiveDevices() const override;
+  syncer::ModelType type() const override;

[skym, 2016/03/22 15:56:26]

You added this to the DeviceInfoTracker methods, while it should be with the
ModelTypeService methods, right?

 
  private:
   friend class DeviceInfoServiceTest;
 
   scoped_ptr<sync_pb::DeviceInfoSpecifics> CreateLocalSpecifics();
   static scoped_ptr<sync_pb::DeviceInfoSpecifics> CreateSpecifics(
       const sync_driver::DeviceInfo& info);
 
   // Allocate new DeviceInfo from SyncData.
   static scoped_ptr<sync_driver::DeviceInfo> CreateDeviceInfo(
@@ skipping 63 matching lines @@
 
   // Should always be last member.
   base::WeakPtrFactory<DeviceInfoService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceInfoService);
 };
 
 }  // namespace sync_driver_v2
 
 #endif  // COMPONENTS_SYNC_DRIVER_DEVICE_INFO_SERVICE_H_