diff options
author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 02:18:48 +0000 |
---|---|---|
committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-13 02:18:48 +0000 |
commit | e23f046af41e813f02ee9ba1e0707cec6dc639ab (patch) | |
tree | d69b1d01dc46131c62d9109b7d800a1631733932 /webkit/tools/test_shell/plugin_tests.cc | |
parent | e3875f053e3b0aa977a324b39644f61cbd85ded7 (diff) | |
download | chromium_src-e23f046af41e813f02ee9ba1e0707cec6dc639ab.zip chromium_src-e23f046af41e813f02ee9ba1e0707cec6dc639ab.tar.gz chromium_src-e23f046af41e813f02ee9ba1e0707cec6dc639ab.tar.bz2 |
Revert change 13558 and 13555 because they broke the plugin
tests and the test_shell_tests on linux.
PLEASE back yourself out when you see you can't fix
a bug instead of leaving it red for days.
Review URL: http://codereview.chromium.org/67074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13575 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/plugin_tests.cc')
-rw-r--r-- | webkit/tools/test_shell/plugin_tests.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index f2ad349..d5ac5ca 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -95,31 +95,3 @@ TEST_F(PluginTest, Refresh) { DeleteTestPlugin(); } - -TEST_F(PluginTest, DefaultPluginLoadTest) { - std::string html = "\ - <div id='result'>Test running....</div>\ - <script>\ - function onSuccess() {\ - var result = document.getElementById('result');\ - result.innerHTML = 'DONE';\ - }\ - </script>\ - <DIV ID=PluginDiv>\ - <object classid=\"clsid:9E8BC6CE-AF35-400c-ABF6-A3F746A1871D\">\ - <embed type=\"application/chromium-test-default-plugin\"\ - mode=\"np_embed\"\ - ></embed>\ - </object>\ - </DIV>\ - "; - - test_shell_->webView()->GetMainFrame()->LoadHTMLString( - html, GURL("about:blank")); - test_shell_->WaitTestFinished(); - - std::wstring text; - test_shell_->webView()->GetMainFrame()->GetContentAsPlainText(10000, &text); - - ASSERT_EQ(true, StartsWith(text, L"DONE", true)); -} |