Revert of Sync: Refactoring of DEVICE_INFO syncable type - Part 1

chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.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/signed_in_devices_api.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/values.h"
 #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"
 #include "extensions/browser/extension_prefs.h"
 
 using base::DictionaryValue;
 using browser_sync::DeviceInfo;
-using browser_sync::LocalDeviceInfoProvider;
 
 namespace extensions {
 
 static const char kPrefStringForIdMapping[] = "id_mapping_dictioanry";
 
 // Gets the dictionary that stores the id mapping. The dictionary is stored
 // in the |ExtensionPrefs|.
 const base::DictionaryValue* GetIdMappingDictionary(
     ExtensionPrefs* extension_prefs,
     const std::string& extension_id) {
@@ skipping 55 matching lines @@
                                pss,
                                extension_prefs);
 }
 
 scoped_ptr<DeviceInfo> GetLocalDeviceInfo(const std::string& extension_id,
                                           Profile* profile) {
   ProfileSyncService* pss = ProfileSyncServiceFactory::GetForProfile(profile);
   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);
   return device.Pass();
 }
 
 bool SignedInDevicesGetFunction::RunSync() {
   scoped_ptr<api::signed_in_devices::Get::Params> params(
       api::signed_in_devices::Get::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
@@ skipping 21 matching lines @@
        ++it) {
     result->Append((*it)->ToValue());
   }
 
   SetResult(result.release());
   return true;
 }
 
 }  // namespace extensions