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

chrome/browser/chromeos/extensions/input_method_api.cc

Index: chrome/browser/chromeos/extensions/input_method_api.cc
diff --git a/chrome/browser/chromeos/extensions/input_method_api.cc b/chrome/browser/chromeos/extensions/input_method_api.cc
index 7c947e106e87aa6a2d1b1e048a5a13c83acd366f..531e5f99406e0b5cfd73f1a5226ead58cc773eb5 100644
--- a/chrome/browser/chromeos/extensions/input_method_api.cc
+++ b/chrome/browser/chromeos/extensions/input_method_api.cc
@@ -12,7 +12,6 @@
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/chromeos/extensions/dictionary_event_router.h"
@@ -76,7 +75,7 @@
 #if !defined(OS_CHROMEOS)
   EXTENSION_FUNCTION_VALIDATE(false);
 #else
-  std::unique_ptr<base::DictionaryValue> output(new base::DictionaryValue());
+  base::DictionaryValue* output = new base::DictionaryValue();
   output->SetBoolean(
       "isPhysicalKeyboardAutocorrectEnabled",
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -86,7 +85,7 @@
                          Profile::FromBrowserContext(browser_context())
                              ->GetPrefs()
                              ->GetBoolean(prefs::kLanguageImeMenuActivated));
-  return RespondNow(OneArgument(std::move(output)));
+  return RespondNow(OneArgument(output));
 #endif
 }
 
@@ -97,7 +96,7 @@
 #else
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
-  return RespondNow(OneArgument(base::MakeUnique<base::StringValue>(
+  return RespondNow(OneArgument(new base::StringValue(
       manager->GetActiveIMEState()->GetCurrentInputMethod().id())));
 #endif
 }
@@ -131,7 +130,7 @@
 #if !defined(OS_CHROMEOS)
   EXTENSION_FUNCTION_VALIDATE(false);
 #else
-  std::unique_ptr<base::ListValue> output(new base::ListValue());
+  base::ListValue* output = new base::ListValue();
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
   chromeos::input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
@@ -148,7 +147,7 @@
     val->SetString("indicator", util->GetInputMethodShortName(input_method));
     output->Append(val);
   }
-  return RespondNow(OneArgument(std::move(output)));
+  return RespondNow(OneArgument(output));
 #endif
 }
 
@@ -168,11 +167,11 @@
   }
 
   const std::set<std::string>& words = dictionary->GetWords();
-  std::unique_ptr<base::ListValue> output(new base::ListValue());
+  base::ListValue* output = new base::ListValue();
   for (auto it = words.begin(); it != words.end(); ++it) {
     output->AppendString(*it);
   }
-  return RespondNow(OneArgument(std::move(output)));
+  return RespondNow(OneArgument(output));
 #endif
 }