Revert of Stop passing raw pointers to base::Value API in c/b/ui

chrome/browser/ui/webui/options/chromeos/cros_language_options_handler.cc

 // Copyright (c) 2012 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/ui/webui/options/chromeos/cros_language_options_handler.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 76 matching lines @@
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_INPUT_METHOD_EXTENSION_DESCRIPTION));
   localized_strings->SetString("noInputMethods",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_NO_INPUT_METHODS));
   localized_strings->SetString("activateImeMenu",
       l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_LANGUAGES_ACTIVATE_IME_MENU));
 
   // GetSupportedInputMethods() never returns NULL.
-  localized_strings->Set("languageList", GetAcceptLanguageList());
+  localized_strings->Set("languageList", GetAcceptLanguageList().release());
   localized_strings->Set("inputMethodList", GetInputMethodList());
 
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodDescriptors ext_ime_descriptors;
   manager->GetActiveIMEState()->GetInputMethodExtensions(&ext_ime_descriptors);
 
-  std::unique_ptr<base::ListValue> ext_ime_list =
-      ConvertInputMethodDescriptorsToIMEList(ext_ime_descriptors);
-  AddImeProvider(ext_ime_list.get());
-  localized_strings->Set("extensionImeList", std::move(ext_ime_list));
+  base::ListValue* ext_ime_list = ConvertInputMethodDescriptorsToIMEList(
+      ext_ime_descriptors);
+  AddImeProvider(ext_ime_list);
+  localized_strings->Set("extensionImeList", ext_ime_list);
 
   ComponentExtensionIMEManager* component_extension_manager =
       input_method::InputMethodManager::Get()
           ->GetComponentExtensionIMEManager();
   localized_strings->Set(
       "componentExtensionImeList",
       ConvertInputMethodDescriptorsToIMEList(
           component_extension_manager->GetAllIMEAsInputMethodDescriptor()));
 }
 
 void CrosLanguageOptionsHandler::RegisterMessages() {
   ::options::LanguageOptionsHandlerCommon::RegisterMessages();
 
   web_ui()->RegisterMessageCallback("inputMethodDisable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodDisableCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("inputMethodEnable",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodEnableCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("inputMethodOptionsOpen",
       base::Bind(&CrosLanguageOptionsHandler::InputMethodOptionsOpenCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("uiLanguageRestart",
       base::Bind(&CrosLanguageOptionsHandler::RestartCallback,
                  base::Unretained(this)));
 }
 
 // static
-std::unique_ptr<base::ListValue>
-CrosLanguageOptionsHandler::GetInputMethodList() {
+base::ListValue* CrosLanguageOptionsHandler::GetInputMethodList() {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   // GetSupportedInputMethods() never return NULL.
   std::unique_ptr<input_method::InputMethodDescriptors> descriptors(
       manager->GetSupportedInputMethods());
 
-  auto input_method_list = base::MakeUnique<base::ListValue>();
+  base::ListValue* input_method_list = new base::ListValue();
 
   for (size_t i = 0; i < descriptors->size(); ++i) {
     const input_method::InputMethodDescriptor& descriptor =
         (*descriptors)[i];
     const std::string display_name =
         manager->GetInputMethodUtil()->GetInputMethodDisplayNameFromId(
             descriptor.id());
     auto dictionary = base::MakeUnique<base::DictionaryValue>();
     dictionary->SetString("id", descriptor.id());
     dictionary->SetString("displayName", display_name);
 
     // One input method can be associated with multiple languages, hence
     // we use a dictionary here.
-    auto languages = base::MakeUnique<base::DictionaryValue>();
+    base::DictionaryValue* languages = new base::DictionaryValue();
     for (size_t i = 0; i < descriptor.language_codes().size(); ++i) {
       languages->SetBoolean(descriptor.language_codes().at(i), true);
     }
-    dictionary->Set("languageCodeSet", std::move(languages));
+    dictionary->Set("languageCodeSet", languages);
 
     input_method_list->Append(std::move(dictionary));
   }
 
   return input_method_list;
 }
 
-std::unique_ptr<base::ListValue>
-CrosLanguageOptionsHandler::ConvertInputMethodDescriptorsToIMEList(
-    const input_method::InputMethodDescriptors& descriptors) {
+base::ListValue*
+    CrosLanguageOptionsHandler::ConvertInputMethodDescriptorsToIMEList(
+        const input_method::InputMethodDescriptors& descriptors) {
   input_method::InputMethodUtil* util =
       input_method::InputMethodManager::Get()->GetInputMethodUtil();
   std::unique_ptr<base::ListValue> ime_ids_list(new base::ListValue());
   for (size_t i = 0; i < descriptors.size(); ++i) {
     const input_method::InputMethodDescriptor& descriptor = descriptors[i];
     std::unique_ptr<base::DictionaryValue> dictionary(
         new base::DictionaryValue());
     dictionary->SetString("id", descriptor.id());
     dictionary->SetString(
         "displayName", util->GetLocalizedDisplayName(descriptor));
     dictionary->SetString("optionsPage", descriptor.options_page_url().spec());
     std::unique_ptr<base::DictionaryValue> language_codes(
         new base::DictionaryValue());
     for (size_t i = 0; i < descriptor.language_codes().size(); ++i)
       language_codes->SetBoolean(descriptor.language_codes().at(i), true);
-    dictionary->Set("languageCodeSet", std::move(language_codes));
+    dictionary->Set("languageCodeSet", language_codes.release());
     ime_ids_list->Append(std::move(dictionary));
   }
-  return ime_ids_list;
+  return ime_ids_list.release();
 }
 
 void CrosLanguageOptionsHandler::SetApplicationLocale(
     const std::string& language_code) {
   Profile* profile = Profile::FromWebUI(web_ui());
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   // Secondary users and public session users cannot change the locale.
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
@@ skipping 67 matching lines @@
         extension_ime_util::GetExtensionIDFromInputMethodID(input_method_id);
     const extensions::Extension* extension =
         enabled_extensions.GetByID(extension_id);
     if (extension)
       entry->SetString("extensionName", extension->name());
   }
 }
 
 }  // namespace options
 }  // namespace chromeos