Sync: Refactoring of DEVICE_INFO syncable type - Part 1

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

Index: chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc
index a7a1d8a306f636ef7373172b592504ac4b2f9923..d48cc0c4f5281811f4969f0cb9c003c6218ae7ad 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/extensions/api/signed_in_devices/id_mapping_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/glue/device_info.h"
+#include "chrome/browser/sync/glue/local_device_info_provider.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/extensions/api/signed_in_devices.h"
@@ -17,6 +18,7 @@
 
 using base::DictionaryValue;
 using browser_sync::DeviceInfo;
+using browser_sync::LocalDeviceInfoProvider;
 
 namespace extensions {
 
@@ -92,7 +94,10 @@ scoped_ptr<DeviceInfo> GetLocalDeviceInfo(const std::string& extension_id,
   if (!pss) {
     return scoped_ptr<DeviceInfo>();
   }
-  std::string guid = pss->GetLocalSyncCacheGUID();
+
+  LocalDeviceInfoProvider* local_device = pss->GetLocalDeviceInfoProvider();
+  DCHECK(local_device);
+  std::string guid = local_device->GetLocalSyncCacheGUID();
   scoped_ptr<DeviceInfo> device = GetDeviceInfoForClientId(guid,
                                                            extension_id,
                                                            profile);