Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/extension_management_api_browsertest.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 "base/command_line.h"
 #include "base/file_path.h"
 #include "base/scoped_temp_dir.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
@@ skipping 83 matching lines @@
           browser()),
       keys::kUninstallCanceledError));
 
   // Make sure the extension wasn't uninstalled.
   EXPECT_TRUE(service->GetExtensionById(id, false) != NULL);
 
   // Uninstall, then accept via the confirm dialog.
   uninstall_function = new UninstallFunction();
   UninstallFunction::SetAutoConfirmForTest(true);
 
-  util::RunFunctionAndReturnResult(
+  util::RunFunctionAndReturnSingleResult(
       uninstall_function,
       base::StringPrintf("[\"%s\", {\"showConfirmDialog\": true}]", id.c_str()),
       browser());
 
   // Make sure the extension was uninstalled.
   EXPECT_TRUE(service->GetExtensionById(id, false) == NULL);
 }
 
 class ExtensionManagementApiEscalationTest : public ExtensionBrowserTest {
  protected:
@@ skipping 48 matching lines @@
 
  private:
   ScopedTempDir scoped_temp_dir_;
 };
 
 const char ExtensionManagementApiEscalationTest::kId[] =
     "pgdpcfcocojkjfbgpiianjngphoopgmo";
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
                        DisabledReason) {
-  scoped_ptr<base::Value> result(
-      util::RunFunctionAndReturnResult(new GetExtensionByIdFunction(),
-                                       base::StringPrintf("[\"%s\"]", kId),
-                                       browser()));
+  scoped_ptr<base::Value> result(util::RunFunctionAndReturnSingleResult(
+      new GetExtensionByIdFunction(),
+      base::StringPrintf("[\"%s\"]", kId),
+      browser()));
   ASSERT_TRUE(result.get() != NULL);
   ASSERT_TRUE(result->IsType(base::Value::TYPE_DICTIONARY));
   base::DictionaryValue* dict =
       static_cast<base::DictionaryValue*>(result.get());
   std::string reason;
   EXPECT_TRUE(dict->GetStringASCII(keys::kDisabledReasonKey, &reason));
   EXPECT_EQ(reason, std::string(keys::kDisabledReasonPermissionsIncrease));
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionManagementApiEscalationTest,
                        ReEnable) {
   // Expect an error about no gesture.
   ReEnable(false, keys::kGestureNeededForEscalationError);
 
   // Expect an error that user cancelled the dialog.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kAppsGalleryInstallAutoConfirmForTests, "cancel");
   ReEnable(true, keys::kUserDidNotReEnableError);
 
   // This should succeed when user accepts dialog.
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
   ReEnable(true, "");
 }