diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-19 20:42:52 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-19 20:42:52 +0000 |
| commit | 3dab5052298c6f98f7ba11ad6d939ec48c94a5a7 (patch) | |
| tree | c24385257217893a4bd344afa4e44d1d550b44d0 /chrome/browser/extensions | |
| parent | 3486ec6dd26c1e40766afa1b54afbc727b00d5d6 (diff) | |
| download | chromium_src-3dab5052298c6f98f7ba11ad6d939ec48c94a5a7.zip chromium_src-3dab5052298c6f98f7ba11ad6d939ec48c94a5a7.tar.gz chromium_src-3dab5052298c6f98f7ba11ad6d939ec48c94a5a7.tar.bz2 | |
Revert 59889 - Fix regression introduced by
http://src.chromium.org/viewvc/chrome?view=rev&revision=57788
Add a delegate interface so that chromium have more fine-grained control over
whether a V8 extension is injected into a script context. This is the
chromium-side change of webkit bug
https://bugs.webkit.org/show_bug.cgi?id=45721
BUG=37290
TEST=covered by unit tests
Review URL: http://codereview.chromium.org/3398001
TBR=mpcomplete@chromium.org
Review URL: http://codereview.chromium.org/3464003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/content_script_all_frames_apitest.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/content_script_all_frames_apitest.cc b/chrome/browser/extensions/content_script_all_frames_apitest.cc index fac6362..3ed2f05 100644 --- a/chrome/browser/extensions/content_script_all_frames_apitest.cc +++ b/chrome/browser/extensions/content_script_all_frames_apitest.cc @@ -9,7 +9,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) { ASSERT_TRUE(RunExtensionTest("content_scripts/all_frames")) << message_; } -IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptExtensionIframe) { +// TODO(rafaelw): This test now fails because non-extension processes do not +// get extension bindings setup by scheme. Fixing crbug.com/53610 will fix this. +IN_PROC_BROWSER_TEST_F(ExtensionApiTest, + DISABLED_ContentScriptExtensionIframe) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(RunExtensionTest("content_scripts/extension_iframe")) << message_; } |