Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/platform_app_browsertest_util.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/extensions/platform_app_browsertest_util.h"
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
@@ skipping 50 matching lines @@
   }
 
   return NULL;
 }
 
 size_t PlatformAppBrowserTest::RunGetWindowsFunctionForExtension(
     const Extension* extension) {
   GetAllWindowsFunction* function = new GetAllWindowsFunction();
   function->set_extension(extension);
   scoped_ptr<base::ListValue> result(utils::ToList(
-      utils::RunFunctionAndReturnResult(function, "[]", browser())));
+      utils::RunFunctionAndReturnSingleResult(function, "[]", browser())));
   return result->GetSize();
 }
 
 bool PlatformAppBrowserTest::RunGetWindowFunctionForExtension(
     int window_id,
     const Extension* extension) {
   GetWindowFunction* function = new GetWindowFunction();
   function->set_extension(extension);
   utils::RunFunction(
           function,
           base::StringPrintf("[%u]", window_id),
           browser(),
           utils::NONE);
-  return function->GetResultValue() != NULL;
+  return function->GetResultList() != NULL;
 }
 
 size_t PlatformAppBrowserTest::GetShellWindowCount() {
   return ShellWindowRegistry::Get(browser()->profile())->
       shell_windows().size();
 }
 
 void PlatformAppBrowserTest::ClearCommandLineArgs() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   CommandLine::StringVector args = command_line->GetArgs();
@@ skipping 18 matching lines @@
       browser()->profile(), extension, GURL(""), params);
 }
 
 void PlatformAppBrowserTest::CloseShellWindow(ShellWindow* window) {
   ui_test_utils::WindowedNotificationObserver destroyed_observer(
       content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
       content::NotificationService::AllSources());
   window->Close();
   destroyed_observer.Wait();
 }