summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-08 15:49:52 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-08 15:49:52 +0000
commit173bf063a54257fcfa4cac7576d2822950d7af31 (patch)
treea3944c884bcdc1414d286332d90f75c5a66e1cac /chrome/browser/extensions
parentc3eb7e8c5d61bff19ea58294aeeedb93e0988503 (diff)
downloadchromium_src-173bf063a54257fcfa4cac7576d2822950d7af31.zip
chromium_src-173bf063a54257fcfa4cac7576d2822950d7af31.tar.gz
chromium_src-173bf063a54257fcfa4cac7576d2822950d7af31.tar.bz2
finished testing functions and added events to bookmark tests.
added infrastructure to better support events and cleaned up callback testing. Review URL: http://codereview.chromium.org/192028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25623 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_bookmarks_apitest.cc1
-rw-r--r--chrome/browser/extensions/extension_bookmarks_module.cc3
2 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_bookmarks_apitest.cc b/chrome/browser/extensions/extension_bookmarks_apitest.cc
index 6eba8b1..1ca6198 100644
--- a/chrome/browser/extensions/extension_bookmarks_apitest.cc
+++ b/chrome/browser/extensions/extension_bookmarks_apitest.cc
@@ -6,6 +6,5 @@
// Flaky, http://crbug.com/19866. Please consult phajdan.jr before re-enabling.
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_Bookmarks) {
- // TODO(erikkay) no initial state for this test.
ASSERT_TRUE(RunExtensionTest("bookmarks")) << message_;
}
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc
index 910684f..f06a19e 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/extensions/extension_bookmarks_module.cc
@@ -197,9 +197,6 @@ void ExtensionBookmarkEventRouter::BookmarkNodeAdded(BookmarkModel* model,
const BookmarkNode* node = parent->GetChild(index);
args.Append(new StringValue(Int64ToString(node->id())));
DictionaryValue* obj = ExtensionBookmarks::GetNodeDictionary(node, false);
-
- // Remove id since it's already being passed as the first argument.
- obj->Remove(keys::kIdKey, NULL);
args.Append(obj);
std::string json_args;