Added support for multiple parameters to Extension API callbacks.

chrome/browser/rlz/rlz_extension_api.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/rlz/rlz_extension_api.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_restrictions.h"
@@ skipping 95 matching lines @@
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   std::string ap_name;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &ap_name));
   rlz_lib::AccessPoint access_point;
   EXTENSION_FUNCTION_VALIDATE(rlz_lib::GetAccessPointFromName(ap_name.c_str(),
                                                               &access_point));
 
   char rlz[rlz_lib::kMaxRlzLength + 1];
   rlz_lib::GetAccessPointRlz(access_point, rlz, rlz_lib::kMaxRlzLength);
-  result_.reset(Value::CreateStringValue(rlz));
+  SetResult(Value::CreateStringValue(rlz));
   return true;
 }
 
 RlzSendFinancialPingFunction::RlzSendFinancialPingFunction()
     : product_(rlz_lib::CHROME),
       exclude_machine_id_(true) {
 }
 
 RlzSendFinancialPingFunction::~RlzSendFinancialPingFunction() {
 }
@@ skipping 45 matching lines @@
   // any 24-hour period.  Calling it more often has no effect.  If a ping is
   // not sent false is returned, but this is not an error, so we should not
   // use the return value of rlz_lib::SendFinancialPing() as the return value
   // of this function.  Callers interested in the return value can register
   // an optional callback function.
   bool sent = rlz_lib::SendFinancialPing(product_, access_points_.get(),
                                          signature_.c_str(), brand_.c_str(),
                                          id_.c_str(), lang_.c_str(),
                                          exclude_machine_id_);
 
-  result_.reset(Value::CreateBooleanValue(sent));
+  SetResult(Value::CreateBooleanValue(sent));
 
   bool post_task_result = content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&RlzSendFinancialPingFunction::RespondOnUIThread, this));
   DCHECK(post_task_result);
 }
 
 void RlzSendFinancialPingFunction::RespondOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   SendResponse(true);
@@ skipping 27 matching lines @@
     std::string ap_name;
     EXTENSION_FUNCTION_VALIDATE(access_points_list->GetString(i, &ap_name));
     EXTENSION_FUNCTION_VALIDATE(rlz_lib::GetAccessPointFromName(
         ap_name.c_str(), &access_points[i]));
   }
   access_points[i] = rlz_lib::NO_ACCESS_POINT;
 
   rlz_lib::ClearProductState(product, access_points.get());
   return true;
 }