Refactor extension event distribution to use Values instead of JSON strings.

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 125 matching lines @@
 BookmarkExtensionEventRouter::~BookmarkExtensionEventRouter() {
   if (model_) {
     model_->RemoveObserver(this);
   }
 }
 
 void BookmarkExtensionEventRouter::Init() {
   model_->AddObserver(this);
 }
 
-void BookmarkExtensionEventRouter::DispatchEvent(Profile *profile,
+void BookmarkExtensionEventRouter::DispatchEvent(Profile* profile,

[miket_OOO, 2012/07/10 22:33:19]

Well done.

                                                  const char* event_name,
-                                                 const std::string& json_args) {
+                                                 ListValue* event_args) {
   if (profile->GetExtensionEventRouter()) {
     profile->GetExtensionEventRouter()->DispatchEventToRenderers(
-        event_name, json_args, NULL, GURL(), extensions::EventFilteringInfo());
+        event_name, event_args, NULL, GURL(), extensions::EventFilteringInfo());
   }
 }
 
 void BookmarkExtensionEventRouter::Loaded(BookmarkModel* model,
                                           bool ids_reassigned) {
   // TODO(erikkay): Perhaps we should send this event down to the extension
   // so they know when it's safe to use the API?
 }
 
 void BookmarkExtensionEventRouter::BookmarkModelBeingDeleted(
     BookmarkModel* model) {
   model_ = NULL;
 }
 
 void BookmarkExtensionEventRouter::BookmarkNodeMoved(
     BookmarkModel* model,
     const BookmarkNode* old_parent,
     int old_index,
     const BookmarkNode* new_parent,
     int new_index) {
-  ListValue args;
+  ListValue* args = new ListValue();
   const BookmarkNode* node = new_parent->GetChild(new_index);
-  args.Append(new StringValue(base::Int64ToString(node->id())));
+  args->Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* object_args = new DictionaryValue();
   object_args->SetString(keys::kParentIdKey,
                          base::Int64ToString(new_parent->id()));
   object_args->SetInteger(keys::kIndexKey, new_index);
   object_args->SetString(keys::kOldParentIdKey,
                          base::Int64ToString(old_parent->id()));
   object_args->SetInteger(keys::kOldIndexKey, old_index);
-  args.Append(object_args);
+  args->Append(object_args);
 
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
-  DispatchEvent(model->profile(), keys::kOnBookmarkMoved, json_args);
+  DispatchEvent(model->profile(), keys::kOnBookmarkMoved, args);
 }
 
 void BookmarkExtensionEventRouter::BookmarkNodeAdded(BookmarkModel* model,
                                                      const BookmarkNode* parent,
                                                      int index) {
-  ListValue args;
+  ListValue* args = new ListValue();
   const BookmarkNode* node = parent->GetChild(index);
-  args.Append(new StringValue(base::Int64ToString(node->id())));
+  args->Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* obj =
       bookmark_extension_helpers::GetNodeDictionary(node, false, false);
-  args.Append(obj);
+  args->Append(obj);
 
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
-  DispatchEvent(model->profile(), keys::kOnBookmarkCreated, json_args);
+  DispatchEvent(model->profile(), keys::kOnBookmarkCreated, args);
 }
 
 void BookmarkExtensionEventRouter::BookmarkNodeRemoved(
     BookmarkModel* model,
     const BookmarkNode* parent,
     int index,
     const BookmarkNode* node) {
-  ListValue args;
-  args.Append(new StringValue(base::Int64ToString(node->id())));
+  ListValue* args = new ListValue();
+  args->Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* object_args = new DictionaryValue();
   object_args->SetString(keys::kParentIdKey,
                          base::Int64ToString(parent->id()));
   object_args->SetInteger(keys::kIndexKey, index);
-  args.Append(object_args);
+  args->Append(object_args);
 
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
-  DispatchEvent(model->profile(), keys::kOnBookmarkRemoved, json_args);
+  DispatchEvent(model->profile(), keys::kOnBookmarkRemoved, args);
 }
 
 void BookmarkExtensionEventRouter::BookmarkNodeChanged(
     BookmarkModel* model, const BookmarkNode* node) {
-  ListValue args;
-  args.Append(new StringValue(base::Int64ToString(node->id())));
+  ListValue* args = new ListValue();
+  args->Append(new StringValue(base::Int64ToString(node->id())));
 
   // TODO(erikkay) The only three things that BookmarkModel sends this
   // notification for are title, url and favicon.  Since we're currently
   // ignoring favicon and since the notification doesn't say which one anyway,
   // for now we only include title and url.  The ideal thing would be to change
   // BookmarkModel to indicate what changed.
   DictionaryValue* object_args = new DictionaryValue();
   object_args->SetString(keys::kTitleKey, node->GetTitle());
   if (node->is_url())
     object_args->SetString(keys::kUrlKey, node->url().spec());
-  args.Append(object_args);
+  args->Append(object_args);
 
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
-  DispatchEvent(model->profile(), keys::kOnBookmarkChanged, json_args);
+  DispatchEvent(model->profile(), keys::kOnBookmarkChanged, args);
 }
 
 void BookmarkExtensionEventRouter::BookmarkNodeFaviconChanged(
     BookmarkModel* model, const BookmarkNode* node) {
   // TODO(erikkay) anything we should do here?
 }
 
 void BookmarkExtensionEventRouter::BookmarkNodeChildrenReordered(
     BookmarkModel* model, const BookmarkNode* node) {
-  ListValue args;
-  args.Append(new StringValue(base::Int64ToString(node->id())));
+  ListValue* args = new ListValue();
+  args->Append(new StringValue(base::Int64ToString(node->id())));
   int childCount = node->child_count();
   ListValue* children = new ListValue();
   for (int i = 0; i < childCount; ++i) {
     const BookmarkNode* child = node->GetChild(i);
     Value* child_id = new StringValue(base::Int64ToString(child->id()));
     children->Append(child_id);
   }
   DictionaryValue* reorder_info = new DictionaryValue();
   reorder_info->Set(keys::kChildIdsKey, children);
-  args.Append(reorder_info);
+  args->Append(reorder_info);
 
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
-  DispatchEvent(model->profile(),
-                keys::kOnBookmarkChildrenReordered,
-                json_args);
+  DispatchEvent(model->profile(), keys::kOnBookmarkChildrenReordered, args);
 }
 
 void BookmarkExtensionEventRouter::
     ExtensiveBookmarkChangesBeginning(BookmarkModel* model) {
-  ListValue args;
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
+  ListValue* args = new ListValue();
   DispatchEvent(model->profile(),
                 keys::kOnBookmarkImportBegan,
-                json_args);
+                args);
 }
 
 void BookmarkExtensionEventRouter::ExtensiveBookmarkChangesEnded(
     BookmarkModel* model) {
-  ListValue args;
-  std::string json_args;
-  base::JSONWriter::Write(&args, &json_args);
+  ListValue* args = new ListValue();
   DispatchEvent(model->profile(),
                 keys::kOnBookmarkImportEnded,
-                json_args);
+                args);
 }
 
 bool GetBookmarksFunction::RunImpl() {
   BookmarkModel* model = profile()->GetBookmarkModel();
   scoped_ptr<ListValue> json(new ListValue());
   Value* arg0;
   EXTENSION_FUNCTION_VALIDATE(args_->Get(0, &arg0));
   if (arg0->IsType(Value::TYPE_LIST)) {
     const ListValue* ids = static_cast<const ListValue*>(arg0);
     size_t count = ids->GetSize();
@@ skipping 647 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()
 }