Added support for multiple parameters to Extension API callbacks.

chrome/browser/bookmarks/bookmark_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/bookmarks/bookmark_extension_api.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 306 matching lines @@
     if (!GetBookmarkIdAsInt64(id_string, &id))
       return false;
     const BookmarkNode* node = model->GetNodeByID(id);
     if (!node) {
       error_ = keys::kNoNodeError;
       return false;
     }
     bookmark_extension_helpers::AddNode(node, json.get(), false);
   }
 
-  result_.reset(json.release());
+  SetResult(json.release());
   return true;
 }
 
 bool GetBookmarkChildrenFunction::RunImpl() {
   BookmarkModel* model = profile()->GetBookmarkModel();
   int64 id;
   std::string id_string;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &id_string));
   if (!GetBookmarkIdAsInt64(id_string, &id))
     return false;
   scoped_ptr<ListValue> json(new ListValue());
   const BookmarkNode* node = model->GetNodeByID(id);
   if (!node) {
     error_ = keys::kNoNodeError;
     return false;
   }
   int child_count = node->child_count();
   for (int i = 0; i < child_count; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     bookmark_extension_helpers::AddNode(child, json.get(), false);
   }
 
-  result_.reset(json.release());
+  SetResult(json.release());
   return true;
 }
 
 bool GetBookmarkRecentFunction::RunImpl() {
   int number_of_items;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &number_of_items));
   if (number_of_items < 1)
     return false;
 
   BookmarkModel* model = profile()->GetBookmarkModel();
   ListValue* json = new ListValue();
   std::vector<const BookmarkNode*> nodes;
   bookmark_utils::GetMostRecentlyAddedEntries(model, number_of_items, &nodes);
   std::vector<const BookmarkNode*>::iterator i = nodes.begin();
   for (; i != nodes.end(); ++i) {
     const BookmarkNode* node = *i;
     bookmark_extension_helpers::AddNode(node, json, false);
   }
-  result_.reset(json);
+  SetResult(json);
   return true;
 }
 
 bool GetBookmarkTreeFunction::RunImpl() {
   BookmarkModel* model = profile()->GetBookmarkModel();
   scoped_ptr<ListValue> json(new ListValue());
   const BookmarkNode* node = model->root_node();
   bookmark_extension_helpers::AddNode(node, json.get(), true);
-  result_.reset(json.release());
+  SetResult(json.release());
   return true;
 }
 
 bool GetBookmarkSubTreeFunction::RunImpl() {
   BookmarkModel* model = profile()->GetBookmarkModel();
   scoped_ptr<ListValue> json(new ListValue());
   Value* arg0;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &arg0));
   int64 id;
   std::string id_string;
   EXTENSION_FUNCTION_VALIDATE(arg0->GetAsString(&id_string));
   if (!GetBookmarkIdAsInt64(id_string, &id))
     return false;
   const BookmarkNode* node = model->GetNodeByID(id);
   if (!node) {
     error_ = keys::kNoNodeError;
     return false;
   }
   bookmark_extension_helpers::AddNode(node, json.get(), true);
-  result_.reset(json.release());
+  SetResult(json.release());
   return true;
 }
 
 bool SearchBookmarksFunction::RunImpl() {
   string16 query;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &query));
 
   BookmarkModel* model = profile()->GetBookmarkModel();
   ListValue* json = new ListValue();
   std::string lang = profile()->GetPrefs()->GetString(prefs::kAcceptLanguages);
   std::vector<const BookmarkNode*> nodes;
   bookmark_utils::GetBookmarksContainingText(model, query,
                                              std::numeric_limits<int>::max(),
                                              lang, &nodes);
   std::vector<const BookmarkNode*>::iterator i = nodes.begin();
   for (; i != nodes.end(); ++i) {
     const BookmarkNode* node = *i;
     bookmark_extension_helpers::AddNode(node, json, false);
   }
 
-  result_.reset(json);
+  SetResult(json);
   return true;
 }
 
 // static
 bool RemoveBookmarkFunction::ExtractIds(const ListValue* args,
                                         std::list<int64>* ids,
                                         bool* invalid_id) {
   std::string id_string;
   if (!args->GetString(0, &id_string))
     return false;
@@ skipping 85 matching lines @@
   else
     node = model->AddFolder(parent, index, title);
   DCHECK(node);
   if (!node) {
     error_ = keys::kNoNodeError;
     return false;
   }
 
   DictionaryValue* ret =
       bookmark_extension_helpers::GetNodeDictionary(node, false, false);
-  result_.reset(ret);
+  SetResult(ret);
 
   return true;
 }
 
 // static
 bool MoveBookmarkFunction::ExtractIds(const ListValue* args,
                                       std::list<int64>* ids,
                                       bool* invalid_id) {
   // For now, Move accepts ID parameters in the same way as an Update.
   return UpdateBookmarkFunction::ExtractIds(args, ids, invalid_id);
@@ skipping 58 matching lines @@
       return false;
     }
   } else {
     index = parent->child_count();
   }
 
   model->Move(node, parent, index);
 
   DictionaryValue* ret =
       bookmark_extension_helpers::GetNodeDictionary(node, false, false);
-  result_.reset(ret);
+  SetResult(ret);
 
   return true;
 }
 
 // static
 bool UpdateBookmarkFunction::ExtractIds(const ListValue* args,
                                         std::list<int64>* ids,
                                         bool* invalid_id) {
   // For now, Update accepts ID parameters in the same way as an Remove.
   return RemoveBookmarkFunction::ExtractIds(args, ids, invalid_id);
@@ skipping 37 matching lines @@
     error_ = keys::kModifySpecialError;
     return false;
   }
   if (has_title)
     model->SetTitle(node, title);
   if (!url.is_empty())
     model->SetURL(node, url);
 
   DictionaryValue* ret =
       bookmark_extension_helpers::GetNodeDictionary(node, false, false);
-  result_.reset(ret);
+  SetResult(ret);
 
   return true;
 }
 
 // Mapper superclass for BookmarkFunctions.
 template <typename BucketIdType>
 class BookmarkBucketMapper : public BucketMapper {
  public:
   virtual ~BookmarkBucketMapper() { STLDeleteValues(&buckets_); }
  protected:
@@ skipping 272 matching lines @@
                                            int index,
                                            void* params) {
 #if !defined(OS_ANDROID)
   // Android does not have support for the standard exporter.
   // TODO(jgreenwald): remove ifdef once extensions are no longer built on
   // Android.
   bookmark_html_writer::WriteBookmarks(profile(), path, NULL);
 #endif
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }