Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/api/discovery/discovery_api_unittest.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.
 
 // This file tests the chrome.alarms extension API.
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/extensions/api/discovery/discovery_api.h"
@@ skipping 62 matching lines @@
  public:
   virtual void SetUp() {
     BrowserWithTestWindowTest::SetUp();
     extension_ = utils::CreateEmptyExtensionWithLocation(Extension::LOAD);
   }
 
   // Runs a function and returns a pointer to a value, transferring ownership.
   base::Value* RunFunctionWithExtension(
       UIThreadExtensionFunction* function, const std::string& args) {
     function->set_extension(extension_.get());
-    return utils::RunFunctionAndReturnResult(function, args, browser());
+    return utils::RunFunctionAndReturnSingleResult(function, args, browser());
   }
 
   // Runs a function and ignores the return value.
   void RunFunction(UIThreadExtensionFunction* function,
                    const std::string& args) {
     scoped_ptr<base::Value> result(RunFunctionWithExtension(function, args));
   }
 
   // Runs a function without argumentsand ignores the return value.
   void RunFunctionWithoutArguments(UIThreadExtensionFunction* function,
@@ skipping 102 matching lines @@
 
   extensions::SuggestedLinksRegistry* registry =
       extensions::SuggestedLinksRegistryFactory::GetForProfile(
           browser()->profile());
 
   const SuggestedLinkList* links = registry->GetAll(GetExtensionId());
   ASSERT_EQ(0u, links->size());
 }
 
 }  // namespace extensions