Remove ExtensionFunction::SetResult(T*) overload.

chrome/browser/extensions/api/hotword_private/hotword_private_api.cc

 // Copyright 2014 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/hotword_private/hotword_private_api.h"
 
+#include <memory>
 #include <string>
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_audio_history_handler.h"
@@ skipping 196 matching lines @@
     result.training_enabled = hotword_service->IsTraining();
     result.always_on_enabled = hotword_service->IsAlwaysOnEnabled();
     result.user_is_active = hotword_service->UserIsActive();
     result.hotword_hardware_available =
         HotwordService::IsHotwordHardwareAvailable();
   }
 
   PrefService* prefs = GetProfile()->GetPrefs();
   result.enabled_set = prefs->HasPrefPath(prefs::kHotwordSearchEnabled);
 
-  SetResult(result.ToValue().release());
+  SetResult(result.ToValue());
   return true;
 }
 
 bool HotwordPrivateSetHotwordSessionStateFunction::RunSync() {
   std::unique_ptr<api::hotword_private::SetHotwordSessionState::Params> params(
       api::hotword_private::SetHotwordSessionState::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
@@ skipping 41 matching lines @@
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
   if (!hotword_service) {
     error_ = hotword_private_constants::kHotwordServiceUnavailable;
     return false;
   }
 
   api::hotword_private::LaunchState result;
   result.launch_mode =
       hotword_service->GetHotwordAudioVerificationLaunchMode();
-  SetResult(result.ToValue().release());
+  SetResult(result.ToValue());
   return true;
 }
 
 bool HotwordPrivateStartTrainingFunction::RunSync() {
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
   if (!hotword_service) {
     error_ = hotword_private_constants::kHotwordServiceUnavailable;
     return false;
   }
@@ skipping 42 matching lines @@
 bool HotwordPrivateGetLocalizedStringsFunction::RunSync() {
 #if defined(OS_CHROMEOS)
   base::string16 device_type = ash::GetChromeOSDeviceName();
 #else
   base::string16 product_name =
       l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
   base::string16 device_type =
       l10n_util::GetStringFUTF16(IDS_HOTWORD_BROWSER_NAME, product_name);
 #endif
 
-  base::DictionaryValue* localized_strings = new base::DictionaryValue();
+  std::unique_ptr<base::DictionaryValue> localized_strings(
+      new base::DictionaryValue());
 
   localized_strings->SetString(
       "close",
       l10n_util::GetStringUTF16(IDS_HOTWORD_OPT_IN_CLOSE));
   localized_strings->SetString(
       "cancel",
       l10n_util::GetStringUTF16(IDS_HOTWORD_OPT_IN_CANCEL));
   localized_strings->SetString(
       "introTitle",
       l10n_util::GetStringUTF16(IDS_HOTWORD_OPT_IN_INTRO_TITLE));
@@ skipping 85 matching lines @@
       l10n_util::GetStringUTF16(
           IDS_HOTWORD_OPT_IN_FINISHED_AUDIO_HISTORY));
   localized_strings->SetString(
       "finish",
       l10n_util::GetStringUTF16(IDS_HOTWORD_OPT_IN_FINISH));
   localized_strings->SetString(
       "finishedWait",
       l10n_util::GetStringUTF16(IDS_HOTWORD_OPT_IN_FINISHED_WAIT));
 
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
-  webui::SetLoadTimeDataDefaults(app_locale, localized_strings);
+  webui::SetLoadTimeDataDefaults(app_locale, localized_strings.get());
 
-  SetResult(localized_strings);
+  SetResult(std::move(localized_strings));
   return true;
 }
 
 bool HotwordPrivateSetAudioHistoryEnabledFunction::RunAsync() {
   std::unique_ptr<api::hotword_private::SetAudioHistoryEnabled::Params> params(
       api::hotword_private::SetAudioHistoryEnabled::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
   if (!hotword_service || !hotword_service->GetAudioHistoryHandler()) {
     error_ = hotword_private_constants::kHotwordServiceUnavailable;
     return false;
   }
 
   hotword_service->GetAudioHistoryHandler()->SetAudioHistoryEnabled(
       params->enabled,
       base::Bind(
         &HotwordPrivateSetAudioHistoryEnabledFunction::SetResultAndSendResponse,
         this));
   return true;
 }
 
 void HotwordPrivateSetAudioHistoryEnabledFunction::SetResultAndSendResponse(
     bool success, bool new_enabled_value) {
   api::hotword_private::AudioHistoryState result;
   result.success = success;
   result.enabled = new_enabled_value;
-  SetResult(result.ToValue().release());
+  SetResult(result.ToValue());
   SendResponse(true);
 }
 
 bool HotwordPrivateGetAudioHistoryEnabledFunction::RunAsync() {
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
   if (!hotword_service || !hotword_service->GetAudioHistoryHandler()) {
     error_ = hotword_private_constants::kHotwordServiceUnavailable;
     return false;
   }
 
   hotword_service->GetAudioHistoryHandler()->GetAudioHistoryEnabled(base::Bind(
       &HotwordPrivateGetAudioHistoryEnabledFunction::SetResultAndSendResponse,
       this));
 
   return true;
 }
 
 void HotwordPrivateGetAudioHistoryEnabledFunction::SetResultAndSendResponse(
     bool success, bool new_enabled_value) {
   api::hotword_private::AudioHistoryState result;
   result.success = success;
   result.enabled = new_enabled_value;
-  SetResult(result.ToValue().release());
+  SetResult(result.ToValue());
   SendResponse(true);
 }
 
 bool HotwordPrivateSpeakerModelExistsResultFunction::RunSync() {
   std::unique_ptr<api::hotword_private::SpeakerModelExistsResult::Params>
       params(api::hotword_private::SpeakerModelExistsResult::Params::Create(
           *args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(GetProfile());
   if (!hotword_service)
     return false;
 
   hotword_service->SpeakerModelExistsComplete(params->exists);
   return true;
 }
 
 }  // namespace extensions