Device info datatype should be moved to components/sync_driver.

chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.cc

 // Copyright (c) 2013 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 "chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/glue/device_info.h"
 #include "components/crx_file/id_util.h"
+#include "components/sync_driver/device_info.h"
 
 using base::DictionaryValue;
 using base::Value;
-using browser_sync::DeviceInfo;
+using sync_driver::DeviceInfo;
 
 namespace extensions {
 
 std::string GetPublicIdFromGUID(
     const base::DictionaryValue& id_mapping,
     const std::string& guid) {
   for (base::DictionaryValue::Iterator it(id_mapping);
        !it.IsAtEnd();
        it.Advance()) {
     const base::Value& value = it.value();
@@ skipping 31 matching lines @@
 
   do {
     string_value = base::IntToString(rand_value);
     rand_value++;
   } while (mapping.Get(string_value, &out_value));
 
   return string_value;
 }
 
 void CreateMappingForUnmappedDevices(
-    std::vector<browser_sync::DeviceInfo*>* device_info,
+    std::vector<DeviceInfo*>* device_info,
     base::DictionaryValue* value) {
   for (unsigned int i = 0; i < device_info->size(); ++i) {
     DeviceInfo* device = (*device_info)[i];
     std::string local_id = GetPublicIdFromGUID(*value,
                                                device->guid());
 
     // If the device does not have a local id, set one.
     if (local_id.empty()) {
       local_id = GetRandomId(*value, device_info->size());
       value->SetString(local_id, device->guid());
@@ skipping 16 matching lines @@
     if ((*it)->guid() == client_id) {
       scoped_ptr<DeviceInfo> device(*it);
       devices.weak_erase(it);
       return device.Pass();
     }
   }
   return scoped_ptr<DeviceInfo>();
 }
 
 }  // namespace  extensions