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

chrome/browser/extensions/api/language_settings_private/language_settings_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/extensions/api/language_settings_private/language_settings_private_api.h"
 
 #include <algorithm>
 #include <map>
 #include <memory>
 #include <string>
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
 #include "base/i18n/rtl.h"
 #include "base/memory/linked_ptr.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate.h"
 #include "chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 207 matching lines @@
       language.display_name_rtl.reset(new bool(true));
     if (locale_set.count(pair.first) > 0)
       language.supports_ui.reset(new bool(true));
     if (spellcheck_language_set.count(pair.first) > 0)
       language.supports_spellcheck.reset(new bool(true));
     if (translate_language_set.count(pair.first) > 0)
       language.supports_translate.reset(new bool(true));
 
     language_list->Append(language.ToValue());
   }
-  return RespondNow(OneArgument(std::move(language_list)));
+  return RespondNow(OneArgument(language_list.release()));
 }
 
 LanguageSettingsPrivateSetLanguageListFunction::
     LanguageSettingsPrivateSetLanguageListFunction()
     : chrome_details_(this) {
 }
 
 LanguageSettingsPrivateSetLanguageListFunction::
     ~LanguageSettingsPrivateSetLanguageListFunction() {
 }
@@ skipping 40 matching lines @@
     ~LanguageSettingsPrivateGetSpellcheckWordsFunction() {
 }
 
 ExtensionFunction::ResponseAction
 LanguageSettingsPrivateGetSpellcheckWordsFunction::Run() {
   SpellcheckService* service =
       SpellcheckServiceFactory::GetForContext(browser_context());
   SpellcheckCustomDictionary* dictionary = service->GetCustomDictionary();
 
   if (dictionary->IsLoaded())
-    return RespondNow(OneArgument(GetSpellcheckWords()));
+    return RespondNow(OneArgument(GetSpellcheckWords().release()));
 
   dictionary->AddObserver(this);
   AddRef();  // Balanced in OnCustomDictionaryLoaded().
   return RespondLater();
 }
 
 void
 LanguageSettingsPrivateGetSpellcheckWordsFunction::OnCustomDictionaryLoaded() {
   SpellcheckService* service =
       SpellcheckServiceFactory::GetForContext(browser_context());
   service->GetCustomDictionary()->RemoveObserver(this);
-  Respond(OneArgument(GetSpellcheckWords()));
+  Respond(OneArgument(GetSpellcheckWords().release()));
   Release();
 }
 
 void
 LanguageSettingsPrivateGetSpellcheckWordsFunction::OnCustomDictionaryChanged(
     const SpellcheckCustomDictionary::Change& dictionary_change) {
   NOTREACHED() << "SpellcheckCustomDictionary::Observer: "
                   "OnCustomDictionaryChanged() called before "
                   "OnCustomDictionaryLoaded()";
 }
@@ skipping 24 matching lines @@
 ExtensionFunction::ResponseAction
 LanguageSettingsPrivateAddSpellcheckWordFunction::Run() {
   std::unique_ptr<language_settings_private::AddSpellcheckWord::Params> params =
       language_settings_private::AddSpellcheckWord::Params::Create(*args_);
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   SpellcheckService* service =
       SpellcheckServiceFactory::GetForContext(browser_context());
   bool success = service->GetCustomDictionary()->AddWord(params->word);
 
-  return RespondNow(
-      OneArgument(base::MakeUnique<base::FundamentalValue>(success)));
+  return RespondNow(OneArgument(new base::FundamentalValue(success)));
 }
 
 LanguageSettingsPrivateRemoveSpellcheckWordFunction::
     LanguageSettingsPrivateRemoveSpellcheckWordFunction() {
 }
 
 LanguageSettingsPrivateRemoveSpellcheckWordFunction::
     ~LanguageSettingsPrivateRemoveSpellcheckWordFunction() {
 }
 
 ExtensionFunction::ResponseAction
 LanguageSettingsPrivateRemoveSpellcheckWordFunction::Run() {
   std::unique_ptr<language_settings_private::RemoveSpellcheckWord::Params>
       params = language_settings_private::RemoveSpellcheckWord::Params::Create(
           *args_);
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   SpellcheckService* service =
       SpellcheckServiceFactory::GetForContext(browser_context());
   bool success = service->GetCustomDictionary()->RemoveWord(params->word);
 
-  return RespondNow(
-      OneArgument(base::MakeUnique<base::FundamentalValue>(success)));
+  return RespondNow(OneArgument(new base::FundamentalValue(success)));
 }
 
 LanguageSettingsPrivateGetTranslateTargetLanguageFunction::
     LanguageSettingsPrivateGetTranslateTargetLanguageFunction()
     : chrome_details_(this) {
 }
 
 LanguageSettingsPrivateGetTranslateTargetLanguageFunction::
     ~LanguageSettingsPrivateGetTranslateTargetLanguageFunction() {
 }
 
 ExtensionFunction::ResponseAction
 LanguageSettingsPrivateGetTranslateTargetLanguageFunction::Run() {
-  return RespondNow(OneArgument(
-      base::MakeUnique<base::StringValue>(TranslateService::GetTargetLanguage(
+  return RespondNow(OneArgument(new base::StringValue(
+      TranslateService::GetTargetLanguage(
           chrome_details_.GetProfile()->GetPrefs()))));
 }
 
 #if defined(OS_CHROMEOS)
 // Populates the vector of input methods using information in the list of
 // descriptors. Used for languageSettingsPrivate.getInputMethodLists().
 void PopulateInputMethodListFromDescriptors(
     const InputMethodDescriptors& descriptors,
     std::vector<language_settings_private::InputMethod>* input_methods) {
   InputMethodManager* manager = InputMethodManager::Get();
@@ skipping 152 matching lines @@
                               input_method_list.end(), input_method_id);
   if (pos != input_method_list.end()) {
     input_method_list.erase(pos);
     prefs->SetString(pref_name, base::JoinString(input_method_list, ","));
   }
 #endif
   return RespondNow(NoArguments());
 }
 
 }  // namespace extensions