[Sync] DeviceInfoService static method and error cleanup.

components/sync/device_info/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_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
 #define COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_
 
 #include <stdint.h>

[maxbogue, 2016/10/28 21:33:20]

Is this still needed? I'm not actually sure what's in stdint.

[skym, 2016/10/28 21:49:24]

Good catch! Done. I actually just added it to the .cc too for int64_t!

 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
@@ skipping 49 matching lines @@
   void RemoveObserver(Observer* observer) override;
   int CountActiveDevices() const override;
 
  private:
   friend class DeviceInfoServiceTest;
 
   // Cache of all syncable and local data, stored by device cache guid.
   using ClientIdToSpecifics =
       std::map<std::string, std::unique_ptr<sync_pb::DeviceInfoSpecifics>>;
 
-  static std::unique_ptr<sync_pb::DeviceInfoSpecifics> CopyToSpecifics(
-      const DeviceInfo& info);
-
-  // Allocate new DeviceInfo from SyncData.
-  static std::unique_ptr<DeviceInfo> CopyToModel(
-      const sync_pb::DeviceInfoSpecifics& specifics);
-  // Conversion as we prepare to hand data to the processor.
-  static std::unique_ptr<EntityData> CopyToEntityData(
-      const sync_pb::DeviceInfoSpecifics& specifics);
-
   // Store SyncData in the cache and durable storage.
   void StoreSpecifics(std::unique_ptr<sync_pb::DeviceInfoSpecifics> specifics,
                       ModelTypeStore::WriteBatch* batch);
   // Delete SyncData from the cache and durable storage, returns true if there
   // was actually anything at the given tag.
   bool DeleteSpecifics(const std::string& tag,
                        ModelTypeStore::WriteBatch* batch);
 
   // Notify all registered observers.
   void NotifyObservers();
@@ skipping 34 matching lines @@
   // Counts the number of active devices relative to |now|. The activeness of a
   // device depends on the amount of time since it was updated, which means
   // comparing it against the current time. |now| is passed into this method to
   // allow unit tests to control expected results.
   int CountActiveDevices(const base::Time now) const;
 
   // Report an error starting up to sync if it tries to connect to this
   // datatype, since these errors prevent us from knowing if sync is enabled.
   void ReportStartupErrorToSync(const std::string& msg);
 
-  // Find the timestamp for the last time this |device_info| was edited.
-  static base::Time GetLastUpdateTime(
-      const sync_pb::DeviceInfoSpecifics& specifics);
-
   // |local_device_info_provider_| isn't owned.
   const LocalDeviceInfoProvider* const local_device_info_provider_;
 
   ClientIdToSpecifics all_data_;
 
   // Registered observers, not owned.
   base::ObserverList<Observer, true> observers_;
 
   // Used to listen for provider initialization. If the provider is already
   // initialized during our constructor then the subscription is never used.
   std::unique_ptr<LocalDeviceInfoProvider::Subscription> subscription_;
 
   // In charge of actually persiting changes to disk, or loading previous data.
   std::unique_ptr<ModelTypeStore> store_;
 
   // If |local_device_info_provider_| has initialized.
   bool has_provider_initialized_ = false;
   // If data has been loaded from the store.
   bool has_data_loaded_ = false;
 
   // Used to update our local device info once every pulse interval.
   base::OneShotTimer pulse_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceInfoService);
 };
 
 }  // namespace syncer
 
 #endif  // COMPONENTS_SYNC_DEVICE_INFO_DEVICE_INFO_SERVICE_H_