| 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 c1023b80edff265cca0b49e3b39d4fd1a66d0863..096316a5caa3259f9382ced913acc7a7609497a7 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
|
| @@ -113,34 +113,33 @@ std::unique_ptr<DeviceInfo> GetLocalDeviceInfo(const std::string& extension_id,
|
| return device;
|
| }
|
|
|
| -bool SignedInDevicesGetFunction::RunSync() {
|
| +ExtensionFunction::ResponseAction SignedInDevicesGetFunction::Run() {
|
| std::unique_ptr<api::signed_in_devices::Get::Params> params(
|
| api::signed_in_devices::Get::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| bool is_local = params->is_local.get() ? *params->is_local : false;
|
|
|
| + Profile* profile = Profile::FromBrowserContext(browser_context());
|
| if (is_local) {
|
| std::unique_ptr<DeviceInfo> device =
|
| - GetLocalDeviceInfo(extension_id(), GetProfile());
|
| + GetLocalDeviceInfo(extension_id(), profile);
|
| std::unique_ptr<base::ListValue> result(new base::ListValue());
|
| if (device.get()) {
|
| result->Append(device->ToValue());
|
| }
|
| - SetResult(std::move(result));
|
| - return true;
|
| + return RespondNow(OneArgument(std::move(result)));
|
| }
|
|
|
| std::vector<std::unique_ptr<DeviceInfo>> devices =
|
| - GetAllSignedInDevices(extension_id(), GetProfile());
|
| + GetAllSignedInDevices(extension_id(), profile);
|
|
|
| std::unique_ptr<base::ListValue> result(new base::ListValue());
|
|
|
| for (const std::unique_ptr<DeviceInfo>& device : devices)
|
| result->Append(device->ToValue());
|
|
|
| - SetResult(std::move(result));
|
| - return true;
|
| + return RespondNow(OneArgument(std::move(result)));
|
| }
|
|
|
| } // namespace extensions
|
|
|