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

chrome/browser/ui/webui/options/language_options_handler_common.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/language_options_handler_common.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.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/profiles/profile.h"
 #include "chrome/browser/spellchecker/spellcheck_factory.h"
 #include "chrome/browser/spellchecker/spellcheck_service.h"
@@ skipping 83 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
   std::string default_target_language =
       TranslateService::GetTargetLanguage(prefs);
   localized_strings->SetString("defaultTargetLanguage",
                                default_target_language);
 
   std::vector<std::string> languages;
   translate::TranslateDownloadManager::GetSupportedLanguages(&languages);
 
-  base::ListValue* languages_list = new base::ListValue();
+  auto languages_list = base::MakeUnique<base::ListValue>();
   for (std::vector<std::string>::iterator it = languages.begin();
        it != languages.end(); ++it) {
     languages_list->AppendString(*it);
   }
 
-  localized_strings->Set("translateSupportedLanguages", languages_list);
+  localized_strings->Set("translateSupportedLanguages",
+                         std::move(languages_list));
 }
 
 void LanguageOptionsHandlerCommon::Uninitialize() {
   SpellcheckService* service = GetSpellcheckService();
   if (!service)
     return;
 
   for (const auto& dict : service->GetHunspellDictionaries())
     dict->RemoveObserver(this);
 }
@@ skipping 39 matching lines @@
       base::Value(language));
 }
 
 void LanguageOptionsHandlerCommon::OnHunspellDictionaryDownloadFailure(
     const std::string& language) {
   web_ui()->CallJavascriptFunctionUnsafe(
       "options.LanguageOptions.onDictionaryDownloadFailure",
       base::Value(language));
 }
 
-base::DictionaryValue* LanguageOptionsHandlerCommon::GetUILanguageCodeSet() {
-  base::DictionaryValue* dictionary = new base::DictionaryValue();
+std::unique_ptr<base::DictionaryValue>
+LanguageOptionsHandlerCommon::GetUILanguageCodeSet() {
+  auto dictionary = base::MakeUnique<base::DictionaryValue>();
   const std::vector<std::string>& available_locales =
       l10n_util::GetAvailableLocales();
   for (size_t i = 0; i < available_locales.size(); ++i)
     dictionary->SetBoolean(available_locales[i], true);
   return dictionary;
 }
 
-base::DictionaryValue*
+std::unique_ptr<base::DictionaryValue>
 LanguageOptionsHandlerCommon::GetSpellCheckLanguageCodeSet() {
-  base::DictionaryValue* dictionary = new base::DictionaryValue();
+  auto dictionary = base::MakeUnique<base::DictionaryValue>();
   std::vector<std::string> spell_check_languages;
   spellcheck::SpellCheckLanguages(&spell_check_languages);
   for (size_t i = 0; i < spell_check_languages.size(); ++i) {
     dictionary->SetBoolean(spell_check_languages[i], true);
   }
   return dictionary;
 }
 
 void LanguageOptionsHandlerCommon::LanguageOptionsOpenCallback(
     const base::ListValue* args) {
@@ skipping 82 matching lines @@
       return;
     }
   }
 }
 
 SpellcheckService* LanguageOptionsHandlerCommon::GetSpellcheckService() {
   return SpellcheckServiceFactory::GetForContext(Profile::FromWebUI(web_ui()));
 }
 
 }  // namespace options