Index: chrome/browser/chromeos/extensions/users_private/users_private_api.cc |
diff --git a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc |
index 8821336913414401286e7f105635a0bff7345230..7d7bca23f9c24792266454ec5bd6c2323211485d 100644 |
--- a/chrome/browser/chromeos/extensions/users_private/users_private_api.cc |
+++ b/chrome/browser/chromeos/extensions/users_private/users_private_api.cc |
@@ -6,6 +6,9 @@ |
#include <stddef.h> |
+#include <utility> |
+ |
+#include "base/memory/ptr_util.h" |
#include "base/values.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chromeos/extensions/users_private/users_private_delegate.h" |
@@ -45,7 +48,7 @@ UsersPrivateGetWhitelistedUsersFunction::Run() { |
// Non-owners should not be able to see the list of users. |
if (!chromeos::ProfileHelper::IsOwnerProfile(profile)) |
- return RespondNow(OneArgument(user_list.release())); |
+ return RespondNow(OneArgument(std::move(user_list))); |
// Create one list to set. This is needed because user white list update is |
// asynchronous and sequential. Before previous write comes back, cached list |
@@ -101,7 +104,7 @@ UsersPrivateGetWhitelistedUsersFunction::Run() { |
user_list->Append(user.ToValue().release()); |
} |
- return RespondNow(OneArgument(user_list.release())); |
+ return RespondNow(OneArgument(std::move(user_list))); |
} |
//////////////////////////////////////////////////////////////////////////////// |
@@ -123,13 +126,15 @@ UsersPrivateAddWhitelistedUserFunction::Run() { |
// Non-owners should not be able to add users. |
if (!chromeos::ProfileHelper::IsOwnerProfile(chrome_details_.GetProfile())) { |
- return RespondNow(OneArgument(new base::FundamentalValue(false))); |
+ return RespondNow( |
+ OneArgument(base::MakeUnique<base::FundamentalValue>(false))); |
} |
std::string username = gaia::CanonicalizeEmail(parameters->email); |
if (chromeos::CrosSettings::Get()->FindEmailInList( |
chromeos::kAccountsPrefUsers, username, NULL)) { |
- return RespondNow(OneArgument(new base::FundamentalValue(false))); |
+ return RespondNow( |
+ OneArgument(base::MakeUnique<base::FundamentalValue>(false))); |
} |
base::StringValue username_value(username); |
@@ -139,7 +144,8 @@ UsersPrivateAddWhitelistedUserFunction::Run() { |
PrefsUtil* prefs_util = delegate->GetPrefsUtil(); |
bool added = prefs_util->AppendToListCrosSetting(chromeos::kAccountsPrefUsers, |
username_value); |
- return RespondNow(OneArgument(new base::FundamentalValue(added))); |
+ return RespondNow( |
+ OneArgument(base::MakeUnique<base::FundamentalValue>(added))); |
} |
//////////////////////////////////////////////////////////////////////////////// |
@@ -163,7 +169,8 @@ UsersPrivateRemoveWhitelistedUserFunction::Run() { |
// Non-owners should not be able to remove users. |
if (!chromeos::ProfileHelper::IsOwnerProfile(chrome_details_.GetProfile())) { |
- return RespondNow(OneArgument(new base::FundamentalValue(false))); |
+ return RespondNow( |
+ OneArgument(base::MakeUnique<base::FundamentalValue>(false))); |
} |
base::StringValue canonical_email(gaia::CanonicalizeEmail(parameters->email)); |
@@ -175,7 +182,8 @@ UsersPrivateRemoveWhitelistedUserFunction::Run() { |
chromeos::kAccountsPrefUsers, canonical_email); |
user_manager::UserManager::Get()->RemoveUser( |
AccountId::FromUserEmail(parameters->email), NULL); |
- return RespondNow(OneArgument(new base::FundamentalValue(removed))); |
+ return RespondNow( |
+ OneArgument(base::MakeUnique<base::FundamentalValue>(removed))); |
} |
//////////////////////////////////////////////////////////////////////////////// |
@@ -193,7 +201,8 @@ ExtensionFunction::ResponseAction |
UsersPrivateIsCurrentUserOwnerFunction::Run() { |
bool is_owner = |
chromeos::ProfileHelper::IsOwnerProfile(chrome_details_.GetProfile()); |
- return RespondNow(OneArgument(new base::FundamentalValue(is_owner))); |
+ return RespondNow( |
+ OneArgument(base::MakeUnique<base::FundamentalValue>(is_owner))); |
} |
//////////////////////////////////////////////////////////////////////////////// |
@@ -212,7 +221,8 @@ UsersPrivateIsWhitelistManagedFunction::Run() { |
bool is_managed = g_browser_process->platform_part() |
->browser_policy_connector_chromeos() |
->IsEnterpriseManaged(); |
- return RespondNow(OneArgument(new base::FundamentalValue(is_managed))); |
+ return RespondNow( |
+ OneArgument(base::MakeUnique<base::FundamentalValue>(is_managed))); |
} |
} // namespace extensions |