Make ExtensionFunction::ArgumentList (PKA MultipleArguments) take a scoped_ptr

extensions/browser/api/runtime/runtime_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 "extensions/browser/api/runtime/runtime_api.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 442 matching lines @@
                base::Bind(&RuntimeRequestUpdateCheckFunction::CheckComplete,
                           this))) {
     return RespondNow(Error(kUpdatesDisabledError));
   }
   return RespondLater();
 }
 
 void RuntimeRequestUpdateCheckFunction::CheckComplete(
     const RuntimeAPIDelegate::UpdateCheckResult& result) {
   if (result.success) {
-    base::ListValue* results = new base::ListValue;
-    results->AppendString(result.response);
     base::DictionaryValue* details = new base::DictionaryValue;
-    results->Append(details);
     details->SetString("version", result.version);
-    Respond(MultipleArguments(results));
+    Respond(TwoArguments(new base::StringValue(result.response), details));
   } else {
-    Respond(SingleArgument(new base::StringValue(result.response)));
+    // HMM(kalman): Why does !success not imply Error()?
+    Respond(OneArgument(new base::StringValue(result.response)));
   }
 }
 
 ExtensionFunction::ResponseAction RuntimeRestartFunction::Run() {
   std::string message;
   bool result =
       RuntimeAPI::GetFactoryInstance()->Get(browser_context())->RestartDevice(
           &message);
   if (!result) {
     return RespondNow(Error(message));
   }
   return RespondNow(NoArguments());
 }
 
 ExtensionFunction::ResponseAction RuntimeGetPlatformInfoFunction::Run() {
   runtime::PlatformInfo info;
   if (!RuntimeAPI::GetFactoryInstance()
            ->Get(browser_context())
            ->GetPlatformInfo(&info)) {
     return RespondNow(Error(kPlatformInfoUnavailable));
   }
-  return RespondNow(MultipleArguments(
-      runtime::GetPlatformInfo::Results::Create(info).release()));
+  return RespondNow(
+      ArgumentList(runtime::GetPlatformInfo::Results::Create(info)));
 }
 
 ExtensionFunction::ResponseAction
 RuntimeGetPackageDirectoryEntryFunction::Run() {
   fileapi::IsolatedContext* isolated_context =
       fileapi::IsolatedContext::GetInstance();
   DCHECK(isolated_context);
 
   std::string relative_path = kPackageDirectoryPath;
   base::FilePath path = extension_->path();
   std::string filesystem_id = isolated_context->RegisterFileSystemForPath(
       fileapi::kFileSystemTypeNativeLocal, path, &relative_path);
 
   int renderer_id = render_view_host_->GetProcess()->GetID();
   content::ChildProcessSecurityPolicy* policy =
       content::ChildProcessSecurityPolicy::GetInstance();
   policy->GrantReadFileSystem(renderer_id, filesystem_id);
   base::DictionaryValue* dict = new base::DictionaryValue();
   dict->SetString("fileSystemId", filesystem_id);
   dict->SetString("baseName", relative_path);
-  return RespondNow(SingleArgument(dict));
+  return RespondNow(OneArgument(dict));
 }
 
 }  // namespace extensions