Revert of 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 d48cc0c4f5281811f4969f0cb9c003c6218ae7ad..a7a1d8a306f636ef7373172b592504ac4b2f9923 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,7 +10,6 @@
 #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"
@@ -18,7 +17,6 @@
 
 using base::DictionaryValue;
 using browser_sync::DeviceInfo;
-using browser_sync::LocalDeviceInfoProvider;
 
 namespace extensions {
 
@@ -94,10 +92,7 @@
   if (!pss) {
     return scoped_ptr<DeviceInfo>();
   }
-
-  LocalDeviceInfoProvider* local_device = pss->GetLocalDeviceInfoProvider();
-  DCHECK(local_device);
-  std::string guid = local_device->GetLocalSyncCacheGUID();
+  std::string guid = pss->GetLocalSyncCacheGUID();
   scoped_ptr<DeviceInfo> device = GetDeviceInfoForClientId(guid,
                                                            extension_id,
                                                            profile);