diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 00:31:00 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-30 00:31:00 +0000 |
| commit | dc5641794fb5f511ca74d1d7392ccc29210ea9cd (patch) | |
| tree | e21e50036a3fd053a512839a83463536854d2e81 /chrome/renderer/extensions | |
| parent | 6b4e3017caa37d0bf760f79292e8cc867b2f4ec9 (diff) | |
| download | chromium_src-dc5641794fb5f511ca74d1d7392ccc29210ea9cd.zip chromium_src-dc5641794fb5f511ca74d1d7392ccc29210ea9cd.tar.gz chromium_src-dc5641794fb5f511ca74d1d7392ccc29210ea9cd.tar.bz2 | |
BUG=12192
R=aa
Review URL: http://codereview.chromium.org/115681
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17269 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/extensions')
| -rw-r--r-- | chrome/renderer/extensions/event_bindings.cc | 4 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_api_client_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/renderer/extensions/extension_process_bindings.cc | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc index 06479dc..19a9245 100644 --- a/chrome/renderer/extensions/event_bindings.cc +++ b/chrome/renderer/extensions/event_bindings.cc @@ -41,8 +41,6 @@ int EventDecrementListenerCount(const std::string& event_name) { return --(data->listener_count[event_name]); } - -const char* kExtensionDeps[] = { JsonJsV8Extension::kName }; const char* kContextAttachCount = "chromium.attachCount"; class ExtensionImpl : public v8::Extension { @@ -50,7 +48,7 @@ class ExtensionImpl : public v8::Extension { ExtensionImpl() : v8::Extension(EventBindings::kName, GetStringResource<IDR_EVENT_BINDINGS_JS>(), - arraysize(kExtensionDeps), kExtensionDeps) { + 0, NULL) { } ~ExtensionImpl() {} diff --git a/chrome/renderer/extensions/extension_api_client_unittest.cc b/chrome/renderer/extensions/extension_api_client_unittest.cc index 9689d95..ddc7c42 100644 --- a/chrome/renderer/extensions/extension_api_client_unittest.cc +++ b/chrome/renderer/extensions/extension_api_client_unittest.cc @@ -71,7 +71,7 @@ TEST_F(ExtensionAPIClientTest, CallbackDispatching) { "}" "function callback(result) {" " assert(typeof result == 'object', 'result not object');" - " assert(goog.json.serialize(result) == '{\"foo\":\"bar\"}', " + " assert(JSON.stringify(result) == '{\"foo\":\"bar\"}', " " 'incorrect result');" " console.log('pass')" "}" diff --git a/chrome/renderer/extensions/extension_process_bindings.cc b/chrome/renderer/extensions/extension_process_bindings.cc index 96f0256..6057a3e 100644 --- a/chrome/renderer/extensions/extension_process_bindings.cc +++ b/chrome/renderer/extensions/extension_process_bindings.cc @@ -25,7 +25,6 @@ const char kExtensionName[] = "chrome/ExtensionProcessBindings"; const char* kExtensionDeps[] = { BaseJsV8Extension::kName, EventBindings::kName, - JsonJsV8Extension::kName, JsonSchemaJsV8Extension::kName, RendererExtensionBindings::kName, }; |