[Sync] Move //components/sync_driver to //components/sync/driver.

components/sync/driver/device_info_sync_service.cc

Index: components/sync/driver/device_info_sync_service.cc
diff --git a/components/sync_driver/device_info_sync_service.cc b/components/sync/driver/device_info_sync_service.cc
similarity index 94%
rename from components/sync_driver/device_info_sync_service.cc
rename to components/sync/driver/device_info_sync_service.cc
index e0520c285bff5b2ff627c81f41d4b99f769b6f2a..cfc4d305bde04882f8f7af26e0ca9e56a1396cb5 100644
--- a/components/sync_driver/device_info_sync_service.cc
+++ b/components/sync/driver/device_info_sync_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/sync_driver/device_info_sync_service.h"
+#include "components/sync/driver/device_info_sync_service.h"
 
 #include <stddef.h>
 
@@ -13,9 +13,9 @@
 #include "base/time/time.h"
 #include "components/sync/api/sync_change.h"
 #include "components/sync/base/time.h"
+#include "components/sync/driver/device_info_util.h"
+#include "components/sync/driver/local_device_info_provider.h"
 #include "components/sync/protocol/sync.pb.h"
-#include "components/sync_driver/device_info_util.h"
-#include "components/sync_driver/local_device_info_provider.h"
 
 namespace sync_driver {
 
@@ -36,8 +36,7 @@ DeviceInfoSyncService::DeviceInfoSyncService(
   DCHECK(local_device_info_provider);
 }
 
-DeviceInfoSyncService::~DeviceInfoSyncService() {
-}
+DeviceInfoSyncService::~DeviceInfoSyncService() {}
 
 SyncMergeResult DeviceInfoSyncService::MergeDataAndStartSyncing(
     ModelType type,
@@ -70,8 +69,7 @@ SyncMergeResult DeviceInfoSyncService::MergeDataAndStartSyncing(
 
   // 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) {
+       iter != initial_sync_data.end(); ++iter) {
     DCHECK_EQ(syncer::DEVICE_INFO, iter->GetDataType());
 
     const std::string& id = iter->GetSpecifics().device_info().cache_guid();
@@ -151,8 +149,7 @@ SyncDataList DeviceInfoSyncService::GetAllSyncData(
   SyncDataList list;
 
   for (SyncDataMap::const_iterator iter = all_data_.begin();
-       iter != all_data_.end();
-       ++iter) {
+       iter != all_data_.end(); ++iter) {
     list.push_back(iter->second);
   }
 
@@ -172,8 +169,7 @@ syncer::SyncError DeviceInfoSyncService::ProcessSyncChanges(
 
   // Iterate over all chanages and merge entries.
   for (SyncChangeList::const_iterator iter = change_list.begin();
-       iter != change_list.end();
-       ++iter) {
+       iter != change_list.end(); ++iter) {
     const SyncData& sync_data = iter->sync_data();
     DCHECK_EQ(syncer::DEVICE_INFO, sync_data.GetDataType());
 
@@ -218,8 +214,7 @@ ScopedVector<DeviceInfo> DeviceInfoSyncService::GetAllDeviceInfo() const {
   ScopedVector<DeviceInfo> list;
 
   for (SyncDataMap::const_iterator iter = all_data_.begin();
-       iter != all_data_.end();
-       ++iter) {
+       iter != all_data_.end(); ++iter) {
     list.push_back(CreateDeviceInfo(iter->second));
   }
 
@@ -269,10 +264,8 @@ DeviceInfo* DeviceInfoSyncService::CreateDeviceInfo(
   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(),
+  return new DeviceInfo(specifics.cache_guid(), specifics.client_name(),
+                        specifics.chrome_version(), specifics.sync_user_agent(),
                         specifics.device_type(),
                         specifics.signin_scoped_device_id());
 }