Added support for multiple parameters to Extension API callbacks.

chrome/browser/extensions/api/cookies/cookies_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.
 
 // Implements the Chrome Extensions Cookies API.
 
 #include "chrome/browser/extensions/api/cookies/cookies_api.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
@@ skipping 212 matching lines @@
       base::Bind(&GetCookieFunction::GetCookieCallback, this));
 }
 
 void GetCookieFunction::GetCookieCallback(const net::CookieList& cookie_list) {
   net::CookieList::const_iterator it;
   for (it = cookie_list.begin(); it != cookie_list.end(); ++it) {
     // Return the first matching cookie. Relies on the fact that the
     // CookieMonster returns them in canonical order (longest path, then
     // earliest creation time).
     if (it->Name() == name_) {
-      result_.reset(
+      SetSingleResult(
           cookies_helpers::CreateCookieValue(*it, store_id_));
       break;
     }
   }
 
   // The cookie doesn't exist; return null.
   if (it == cookie_list.end())
-    result_.reset(Value::CreateNullValue());
+    SetSingleResult(Value::CreateNullValue());
 
   bool rv = BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&GetCookieFunction::RespondOnUIThread, this));
   DCHECK(rv);
 }
 
 void GetCookieFunction::RespondOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SendResponse(true);
@@ skipping 37 matching lines @@
 }
 
 void GetAllCookiesFunction::GetAllCookiesCallback(
     const net::CookieList& cookie_list) {
   const extensions::Extension* extension = GetExtension();
   if (extension) {
     ListValue* matching_list = new ListValue();
     cookies_helpers::AppendMatchingCookiesToList(
         cookie_list, store_id_, url_, details_,
         GetExtension(), matching_list);
-    result_.reset(matching_list);
+    SetSingleResult(matching_list);
   }
   bool rv = BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&GetAllCookiesFunction::RespondOnUIThread, this));
   DCHECK(rv);
 }
 
 void GetAllCookiesFunction::RespondOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SendResponse(true);
@@ skipping 91 matching lines @@
       base::Bind(&SetCookieFunction::PullCookieCallback, this));
 }
 
 void SetCookieFunction::PullCookieCallback(const net::CookieList& cookie_list) {
   net::CookieList::const_iterator it;
   for (it = cookie_list.begin(); it != cookie_list.end(); ++it) {
     // Return the first matching cookie. Relies on the fact that the
     // CookieMonster returns them in canonical order (longest path, then
     // earliest creation time).
     if (it->Name() == name_) {
-      result_.reset(
+      SetSingleResult(
           cookies_helpers::CreateCookieValue(*it, store_id_));
       break;
     }
   }
 
   bool rv = BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&SetCookieFunction::RespondOnUIThread, this));
   DCHECK(rv);
 }
@@ skipping 52 matching lines @@
       url_, name_,
       base::Bind(&RemoveCookieFunction::RemoveCookieCallback, this));
 }
 
 void RemoveCookieFunction::RemoveCookieCallback() {
   // Build the callback result
   DictionaryValue* resultDictionary = new DictionaryValue();
   resultDictionary->SetString(keys::kNameKey, name_);
   resultDictionary->SetString(keys::kUrlKey, url_.spec());
   resultDictionary->SetString(keys::kStoreIdKey, store_id_);
-  result_.reset(resultDictionary);
+  SetSingleResult(resultDictionary);
 
   // Return to UI thread
   bool rv = BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&RemoveCookieFunction::RespondOnUIThread, this));
   DCHECK(rv);
 }
 
 void RemoveCookieFunction::RespondOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 34 matching lines @@
     cookie_store_list->Append(
         cookies_helpers::CreateCookieStoreValue(
             original_profile, original_tab_ids.release()));
   }
   if (incognito_tab_ids.get() && incognito_tab_ids->GetSize() > 0 &&
       incognito_profile) {
     cookie_store_list->Append(
         cookies_helpers::CreateCookieStoreValue(
             incognito_profile, incognito_tab_ids.release()));
   }
-  result_.reset(cookie_store_list);
+  SetSingleResult(cookie_store_list);
   return true;
 }
 
 void GetAllCookieStoresFunction::Run() {
   SendResponse(RunImpl());
 }
 
 }  // namespace extensions