Revert of [Sync] Move //components/sync to the syncer namespace. (patchset #5 id:40001 of https://co

components/sync/device_info/device_info_sync_service.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/device_info/device_info_sync_service.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/sync/base/time.h"
 #include "components/sync/device_info/device_info_util.h"
 #include "components/sync/device_info/local_device_info_provider.h"
 #include "components/sync/protocol/sync.pb.h"
 
-namespace syncer {
+namespace sync_driver {
 
 using base::Time;
 using base::TimeDelta;
+using syncer::ModelType;
+using syncer::SyncChange;
+using syncer::SyncChangeList;
+using syncer::SyncChangeProcessor;
+using syncer::SyncData;
+using syncer::SyncDataList;
+using syncer::SyncErrorFactory;
+using syncer::SyncMergeResult;
 
 DeviceInfoSyncService::DeviceInfoSyncService(
     LocalDeviceInfoProvider* local_device_info_provider)
     : local_device_info_provider_(local_device_info_provider) {
   DCHECK(local_device_info_provider);
 }
 
 DeviceInfoSyncService::~DeviceInfoSyncService() {}
 
 SyncMergeResult DeviceInfoSyncService::MergeDataAndStartSyncing(
     ModelType type,
     const SyncDataList& initial_sync_data,
     std::unique_ptr<SyncChangeProcessor> sync_processor,
     std::unique_ptr<SyncErrorFactory> error_handler) {
   DCHECK(sync_processor.get());
   DCHECK(error_handler.get());
-  DCHECK_EQ(type, DEVICE_INFO);
+  DCHECK_EQ(type, syncer::DEVICE_INFO);
 
   DCHECK(!IsSyncing());
 
   sync_processor_ = std::move(sync_processor);
   error_handler_ = std::move(error_handler);
 
   // Initialization should be completed before this type is enabled
   // and local device info must be available.
   const DeviceInfo* local_device_info =
       local_device_info_provider_->GetLocalDeviceInfo();
   DCHECK(local_device_info != NULL);
 
   // Indicates whether a local device has been added or updated.
   // |change_type| defaults to ADD and might be changed to
   // UPDATE to INVALID down below if the initial data contains
   // data matching the local device ID.
   SyncChange::SyncChangeType change_type = SyncChange::ACTION_ADD;
   TimeDelta pulse_delay;
   size_t num_items_new = 0;
   size_t num_items_updated = 0;
 
   // Iterate over all initial sync data and copy it to the cache.
   for (SyncDataList::const_iterator iter = initial_sync_data.begin();
        iter != initial_sync_data.end(); ++iter) {
-    DCHECK_EQ(DEVICE_INFO, iter->GetDataType());
+    DCHECK_EQ(syncer::DEVICE_INFO, iter->GetDataType());
 
     const std::string& id = iter->GetSpecifics().device_info().cache_guid();
 
     if (id == local_device_info->guid()) {
       // |initial_sync_data| contains data matching the local device.
       std::unique_ptr<DeviceInfo> synced_local_device_info =
           base::WrapUnique(CreateDeviceInfo(*iter));
 
       pulse_delay = DeviceInfoUtil::CalculatePulseDelay(
           GetLastUpdateTime(*iter), Time::Now());
@@ skipping 10 matching lines @@
         continue;
       }
     } else {
       // A new device that doesn't match the local device.
       num_items_new++;
     }
 
     StoreSyncData(id, *iter);
   }
 
-  SyncMergeResult result(type);
+  syncer::SyncMergeResult result(type);
 
   // If the SyncData for the local device is new or different then send it
   // immediately, otherwise wait until the pulse interval has elapsed from the
   // previous update. Regardless of the branch here we setup a timer loop with
   // SendLocalData such that we continue pulsing every interval.
   if (change_type == SyncChange::ACTION_INVALID) {
     pulse_timer_.Start(
         FROM_HERE, pulse_delay,
         base::Bind(&DeviceInfoSyncService::SendLocalData,
                    base::Unretained(this), SyncChange::ACTION_UPDATE));
   } else {
     SendLocalData(change_type);
   }
 
   result.set_num_items_before_association(1);
   result.set_num_items_after_association(all_data_.size());
   result.set_num_items_added(num_items_new);
   result.set_num_items_modified(num_items_updated);
   result.set_num_items_deleted(0);
 
   NotifyObservers();
 
   return result;
 }
 
 bool DeviceInfoSyncService::IsSyncing() const {
   return !all_data_.empty();
 }
 
-void DeviceInfoSyncService::StopSyncing(ModelType type) {
+void DeviceInfoSyncService::StopSyncing(syncer::ModelType type) {
   bool was_syncing = IsSyncing();
 
   pulse_timer_.Stop();
   all_data_.clear();
   sync_processor_.reset();
   error_handler_.reset();
 
   if (was_syncing) {
     NotifyObservers();
   }
 }
 
-SyncDataList DeviceInfoSyncService::GetAllSyncData(ModelType type) const {
+SyncDataList DeviceInfoSyncService::GetAllSyncData(
+    syncer::ModelType type) const {
   SyncDataList list;
 
   for (SyncDataMap::const_iterator iter = all_data_.begin();
        iter != all_data_.end(); ++iter) {
     list.push_back(iter->second);
   }
 
   return list;
 }
 
-SyncError DeviceInfoSyncService::ProcessSyncChanges(
+syncer::SyncError DeviceInfoSyncService::ProcessSyncChanges(
     const tracked_objects::Location& from_here,
     const SyncChangeList& change_list) {
-  SyncError error;
+  syncer::SyncError error;
 
   DCHECK(local_device_info_provider_->GetLocalDeviceInfo());
   const std::string& local_device_id =
       local_device_info_provider_->GetLocalDeviceInfo()->guid();
 
   bool has_changes = false;
 
   // Iterate over all chanages and merge entries.
   for (SyncChangeList::const_iterator iter = change_list.begin();
        iter != change_list.end(); ++iter) {
     const SyncData& sync_data = iter->sync_data();
-    DCHECK_EQ(DEVICE_INFO, sync_data.GetDataType());
+    DCHECK_EQ(syncer::DEVICE_INFO, sync_data.GetDataType());
 
     const std::string& client_id =
         sync_data.GetSpecifics().device_info().cache_guid();
     // Ignore device info matching the local device.
     if (local_device_id == client_id) {
       DVLOG(1) << "Ignoring sync changes for the local DEVICE_INFO";
       continue;
     }
 
-    if (iter->change_type() == SyncChange::ACTION_DELETE) {
+    if (iter->change_type() == syncer::SyncChange::ACTION_DELETE) {
       has_changes = true;
       DeleteSyncData(client_id);
-    } else if (iter->change_type() == SyncChange::ACTION_UPDATE ||
-               iter->change_type() == SyncChange::ACTION_ADD) {
+    } else if (iter->change_type() == syncer::SyncChange::ACTION_UPDATE ||
+               iter->change_type() == syncer::SyncChange::ACTION_ADD) {
       has_changes = true;
       StoreSyncData(client_id, sync_data);
     } else {
-      error.Reset(FROM_HERE, "Invalid action received.", DEVICE_INFO);
+      error.Reset(FROM_HERE, "Invalid action received.", syncer::DEVICE_INFO);
     }
   }
 
   if (has_changes) {
     NotifyObservers();
   }
 
   return error;
 }
 
@@ skipping 38 matching lines @@
 SyncData DeviceInfoSyncService::CreateLocalData(const DeviceInfo* info) {
   sync_pb::EntitySpecifics entity;
   sync_pb::DeviceInfoSpecifics& specifics = *entity.mutable_device_info();
 
   specifics.set_cache_guid(info->guid());
   specifics.set_client_name(info->client_name());
   specifics.set_chrome_version(info->chrome_version());
   specifics.set_sync_user_agent(info->sync_user_agent());
   specifics.set_device_type(info->device_type());
   specifics.set_signin_scoped_device_id(info->signin_scoped_device_id());
-  specifics.set_last_updated_timestamp(TimeToProtoTime(Time::Now()));
+  specifics.set_last_updated_timestamp(syncer::TimeToProtoTime(Time::Now()));
 
   return CreateLocalData(entity);
 }
 
 SyncData DeviceInfoSyncService::CreateLocalData(
     const sync_pb::EntitySpecifics& entity) {
   const sync_pb::DeviceInfoSpecifics& specifics = entity.device_info();
   return SyncData::CreateLocalData(DeviceInfoUtil::SpecificsToTag(specifics),
                                    specifics.client_name(), entity);
 }
 
-DeviceInfo* DeviceInfoSyncService::CreateDeviceInfo(const SyncData& sync_data) {
+DeviceInfo* DeviceInfoSyncService::CreateDeviceInfo(
+    const syncer::SyncData& sync_data) {
   const sync_pb::DeviceInfoSpecifics& specifics =
       sync_data.GetSpecifics().device_info();
 
   return new DeviceInfo(specifics.cache_guid(), specifics.client_name(),
                         specifics.chrome_version(), specifics.sync_user_agent(),
                         specifics.device_type(),
                         specifics.signin_scoped_device_id());
 }
 
 void DeviceInfoSyncService::StoreSyncData(const std::string& client_id,
@@ skipping 38 matching lines @@
   return std::count_if(all_data_.begin(), all_data_.end(),
                        [now](SyncDataMap::const_reference pair) {
                          return DeviceInfoUtil::IsActive(
                              GetLastUpdateTime(pair.second), now);
                        });
 }
 
 // static
 Time DeviceInfoSyncService::GetLastUpdateTime(const SyncData& device_info) {
   if (device_info.GetSpecifics().device_info().has_last_updated_timestamp()) {
-    return ProtoTimeToTime(
+    return syncer::ProtoTimeToTime(
         device_info.GetSpecifics().device_info().last_updated_timestamp());
   } else if (!device_info.IsLocal()) {
     // If there is no |last_updated_timestamp| present, fallback to mod time.
-    return SyncDataRemote(device_info).GetModifiedTime();
+    return syncer::SyncDataRemote(device_info).GetModifiedTime();
   } else {
     // We shouldn't reach this point for remote data, so this means we're likely
     // looking at the local device info. Using a long ago time is perfect, since
     // the desired behavior is to update/pulse our data as soon as possible.
     return Time();
   }
 }
 
-}  // namespace syncer
+}  // namespace sync_driver