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

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>
 #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"
 #include "base/timer/timer.h"
 #include "components/sync/api/model_type_service.h"
 #include "components/sync/api/model_type_store.h"
 #include "components/sync/core/simple_metadata_change_list.h"
-#include "components/sync_driver/device_info_tracker.h"
-#include "components/sync_driver/local_device_info_provider.h"
+#include "components/sync/driver/device_info_tracker.h"
+#include "components/sync/driver/local_device_info_provider.h"
 
 namespace syncer {
 class SyncError;
 }  // namespace syncer
 
 namespace syncer_v2 {
 class ModelTypeChangeProcessor;
 }  // namespace syncer_v2
 
 namespace sync_pb {
@@ skipping 147 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_