Revert of ExtensionFunction: don't pass ownership of base::Value by raw pointer.

chrome/browser/chromeos/extensions/users_private/users_private_api.cc

 // Copyright 2015 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/chromeos/extensions/users_private/users_private_api.h"
 
 #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"
 #include "chrome/browser/chromeos/extensions/users_private/users_private_delegate_factory.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
@@ skipping 19 matching lines @@
     ~UsersPrivateGetWhitelistedUsersFunction() {
 }
 
 ExtensionFunction::ResponseAction
 UsersPrivateGetWhitelistedUsersFunction::Run() {
   Profile* profile = chrome_details_.GetProfile();
   std::unique_ptr<base::ListValue> user_list(new base::ListValue);
 
   // Non-owners should not be able to see the list of users.
   if (!chromeos::ProfileHelper::IsOwnerProfile(profile))
-    return RespondNow(OneArgument(std::move(user_list)));
+    return RespondNow(OneArgument(user_list.release()));
 
   // Create one list to set. This is needed because user white list update is
   // asynchronous and sequential. Before previous write comes back, cached list
   // is stale and should not be used for appending. See http://crbug.com/127215
   std::unique_ptr<base::ListValue> email_list;
 
   UsersPrivateDelegate* delegate =
       UsersPrivateDelegateFactory::GetForBrowserContext(browser_context());
   PrefsUtil* prefs_util = delegate->GetPrefsUtil();
 
@@ skipping 35 matching lines @@
   // Now populate the list of User objects for returning to the JS.
   for (size_t i = 0; i < email_list->GetSize(); ++i) {
     api::users_private::User user;
     email_list->GetString(i, &user.email);
 
     user.is_owner = chromeos::ProfileHelper::IsOwnerProfile(profile) &&
                     user.email == profile->GetProfileUserName();
     user_list->Append(user.ToValue().release());
   }
 
-  return RespondNow(OneArgument(std::move(user_list)));
+  return RespondNow(OneArgument(user_list.release()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UsersPrivateAddWhitelistedUserFunction
 
 UsersPrivateAddWhitelistedUserFunction::UsersPrivateAddWhitelistedUserFunction()
     : chrome_details_(this) {
 }
 
 UsersPrivateAddWhitelistedUserFunction::
     ~UsersPrivateAddWhitelistedUserFunction() {
 }
 
 ExtensionFunction::ResponseAction
 UsersPrivateAddWhitelistedUserFunction::Run() {
   std::unique_ptr<api::users_private::AddWhitelistedUser::Params> parameters =
       api::users_private::AddWhitelistedUser::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(parameters.get());
 
   // Non-owners should not be able to add users.
   if (!chromeos::ProfileHelper::IsOwnerProfile(chrome_details_.GetProfile())) {
-    return RespondNow(
-        OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
+    return RespondNow(OneArgument(new base::FundamentalValue(false)));
   }
 
   std::string username = gaia::CanonicalizeEmail(parameters->email);
   if (chromeos::CrosSettings::Get()->FindEmailInList(
           chromeos::kAccountsPrefUsers, username, NULL)) {
-    return RespondNow(
-        OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
+    return RespondNow(OneArgument(new base::FundamentalValue(false)));
   }
 
   base::StringValue username_value(username);
 
   UsersPrivateDelegate* delegate =
       UsersPrivateDelegateFactory::GetForBrowserContext(browser_context());
   PrefsUtil* prefs_util = delegate->GetPrefsUtil();
   bool added = prefs_util->AppendToListCrosSetting(chromeos::kAccountsPrefUsers,
                                                    username_value);
-  return RespondNow(
-      OneArgument(base::MakeUnique<base::FundamentalValue>(added)));
+  return RespondNow(OneArgument(new base::FundamentalValue(added)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UsersPrivateRemoveWhitelistedUserFunction
 
 UsersPrivateRemoveWhitelistedUserFunction::
     UsersPrivateRemoveWhitelistedUserFunction()
     : chrome_details_(this) {
 }
 
 UsersPrivateRemoveWhitelistedUserFunction::
     ~UsersPrivateRemoveWhitelistedUserFunction() {
 }
 
 ExtensionFunction::ResponseAction
 UsersPrivateRemoveWhitelistedUserFunction::Run() {
   std::unique_ptr<api::users_private::RemoveWhitelistedUser::Params>
       parameters =
           api::users_private::RemoveWhitelistedUser::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(parameters.get());
 
   // Non-owners should not be able to remove users.
   if (!chromeos::ProfileHelper::IsOwnerProfile(chrome_details_.GetProfile())) {
-    return RespondNow(
-        OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
+    return RespondNow(OneArgument(new base::FundamentalValue(false)));
   }
 
   base::StringValue canonical_email(gaia::CanonicalizeEmail(parameters->email));
 
   UsersPrivateDelegate* delegate =
       UsersPrivateDelegateFactory::GetForBrowserContext(browser_context());
   PrefsUtil* prefs_util = delegate->GetPrefsUtil();
   bool removed = prefs_util->RemoveFromListCrosSetting(
       chromeos::kAccountsPrefUsers, canonical_email);
   user_manager::UserManager::Get()->RemoveUser(
       AccountId::FromUserEmail(parameters->email), NULL);
-  return RespondNow(
-      OneArgument(base::MakeUnique<base::FundamentalValue>(removed)));
+  return RespondNow(OneArgument(new base::FundamentalValue(removed)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UsersPrivateIsCurrentUserOwnerFunction
 
 UsersPrivateIsCurrentUserOwnerFunction::UsersPrivateIsCurrentUserOwnerFunction()
     : chrome_details_(this) {
 }
 
 UsersPrivateIsCurrentUserOwnerFunction::
     ~UsersPrivateIsCurrentUserOwnerFunction() {
 }
 
 ExtensionFunction::ResponseAction
 UsersPrivateIsCurrentUserOwnerFunction::Run() {
   bool is_owner =
       chromeos::ProfileHelper::IsOwnerProfile(chrome_details_.GetProfile());
-  return RespondNow(
-      OneArgument(base::MakeUnique<base::FundamentalValue>(is_owner)));
+  return RespondNow(OneArgument(new base::FundamentalValue(is_owner)));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // UsersPrivateIsWhitelistManagedFunction
 
 UsersPrivateIsWhitelistManagedFunction::
     UsersPrivateIsWhitelistManagedFunction() {
 }
 
 UsersPrivateIsWhitelistManagedFunction::
     ~UsersPrivateIsWhitelistManagedFunction() {
 }
 
 ExtensionFunction::ResponseAction
 UsersPrivateIsWhitelistManagedFunction::Run() {
   bool is_managed = g_browser_process->platform_part()
                         ->browser_policy_connector_chromeos()
                         ->IsEnterpriseManaged();
-  return RespondNow(
-      OneArgument(base::MakeUnique<base::FundamentalValue>(is_managed)));
+  return RespondNow(OneArgument(new base::FundamentalValue(is_managed)));
 }
 
 }  // namespace extensions