Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/extension_record_api_test.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/extension_record_api.h"
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/file_path.h"
@@ skipping 211 matching lines @@
       scoped_ptr<base::ListValue>* out_list) {
 
     scoped_refptr<CaptureURLsFunction> capture_function(
         new CaptureURLsFunction(new TestProcessStrategy(&temp_files_)));
 
     std::string escaped_user_data_dir;
     ReplaceChars(user_data_dir.AsUTF8Unsafe(), "\\", "\\\\",
         &escaped_user_data_dir);
 
     out_list->reset(utils::ToList(
-        utils::RunFunctionAndReturnResult(capture_function.get(),
+        utils::RunFunctionAndReturnSingleResult(capture_function.get(),
         base::StringPrintf(kCaptureArgs1, escaped_user_data_dir.c_str()),
         browser())));
 
     return capture_function;
   }
 
   // Verify that the URL list of good and bad URLs was properly handled.
   // Needed by several tests.
   bool VerifyURLHandling(const ListValue* result,
       const TestProcessStrategy& strategy) {
@@ skipping 63 matching lines @@
   scoped_ptr<base::ListValue> capture_result;
   RunCapture(user_data_dir.path(), &capture_result);
 
   std::string escaped_user_data_dir;
   ReplaceChars(user_data_dir.path().AsUTF8Unsafe(), "\\", "\\\\",
       &escaped_user_data_dir);
 
   scoped_refptr<ReplayURLsFunction> playback_function(new ReplayURLsFunction(
       new TestProcessStrategy(&temp_files_)));
   scoped_ptr<base::DictionaryValue> result(utils::ToDictionary(
-      utils::RunFunctionAndReturnResult(playback_function,
+      utils::RunFunctionAndReturnSingleResult(playback_function,
       base::StringPrintf(kPlaybackArgs1, escaped_user_data_dir.c_str()),
       browser())));
 
   // Check that command line user-data-dir was overridden.  (That
   // it was *consistently* overridden in both capture and replay
   // is verified elsewhere.
   const TestProcessStrategy &strategy =
       static_cast<const TestProcessStrategy &>(
       playback_function->GetProcessStrategy());
   const CommandLine& command_line = strategy.GetCommandLine();
 
   EXPECT_TRUE(command_line.HasSwitch(switches::kUserDataDir));
   EXPECT_TRUE(command_line.GetSwitchValuePath(switches::kUserDataDir) !=
       FilePath(kDummyDirName));
 
    // Check that command line load-extension was overridden.
   EXPECT_TRUE(command_line.HasSwitch(switches::kLoadExtension) &&
       command_line.GetSwitchValuePath(switches::kLoadExtension)
       != FilePath(kDummyDirName));
 
    // Check for return value with proper stats.
   EXPECT_EQ(kTestStatistics, utils::GetString(result.get(), kStatsKey));
 
   ListValue* errors = NULL;
   EXPECT_TRUE(result->GetList(kErrorsKey, &errors));
   EXPECT_TRUE(VerifyURLHandling(errors, strategy));
 }