Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/api/dns/dns_apitest.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/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/dns/dns_api.h"
 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h"
 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 
 using extension_function_test_utils::CreateEmptyExtension;
-using extension_function_test_utils::RunFunctionAndReturnResult;
+using extension_function_test_utils::RunFunctionAndReturnSingleResult;
 
 namespace {
 
 class DnsApiTest : public PlatformAppApiTest {
  public:
   DnsApiTest() : resolver_event_(true, false),
                  resolver_creator_(new extensions::MockHostResolverCreator()) {
   }
 
   void SetUpOnMainThread() OVERRIDE {
@@ skipping 19 matching lines @@
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveIPLiteral) {
   scoped_refptr<extensions::DnsResolveFunction> resolve_function(
       new extensions::DnsResolveFunction());
   scoped_refptr<extensions::Extension> empty_extension(CreateEmptyExtension());
 
   resolve_function->set_extension(empty_extension.get());
   resolve_function->set_has_callback(true);
 
-  scoped_ptr<base::Value> result(RunFunctionAndReturnResult(
+  scoped_ptr<base::Value> result(RunFunctionAndReturnSingleResult(
       resolve_function, "[\"127.0.0.1\"]", browser()));
   ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
   DictionaryValue *value = static_cast<DictionaryValue*>(result.get());
 
   int resultCode;
   EXPECT_TRUE(value->GetInteger("resultCode", &resultCode));
   EXPECT_EQ(net::OK, resultCode);
 
   std::string address;
   EXPECT_TRUE(value->GetString("address", &address));
   EXPECT_EQ("127.0.0.1", address);
 }
 
 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsResolveHostname) {
   scoped_refptr<extensions::DnsResolveFunction> resolve_function(
       new extensions::DnsResolveFunction());
   scoped_refptr<extensions::Extension> empty_extension(CreateEmptyExtension());
 
   resolve_function->set_extension(empty_extension.get());
   resolve_function->set_has_callback(true);
 
   std::string function_arguments("[\"");
   function_arguments += extensions::MockHostResolverCreator::kHostname;
   function_arguments += "\"]";
   scoped_ptr<base::Value> result(
-      RunFunctionAndReturnResult(resolve_function.get(),
-                                 function_arguments, browser()));
+      RunFunctionAndReturnSingleResult(resolve_function.get(),
+                                       function_arguments, browser()));
   ASSERT_EQ(base::Value::TYPE_DICTIONARY, result->GetType());
   DictionaryValue *value = static_cast<DictionaryValue*>(result.get());
 
   int resultCode;
   EXPECT_TRUE(value->GetInteger("resultCode", &resultCode));
   EXPECT_EQ(net::OK, resultCode);
 
   std::string address;
   EXPECT_TRUE(value->GetString("address", &address));
   EXPECT_EQ(extensions::MockHostResolverCreator::kAddress, address);
 }
 
 IN_PROC_BROWSER_TEST_F(DnsApiTest, DnsExtension) {
   ASSERT_TRUE(RunExtensionTest("dns/api")) << message_;
 }