diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 18:08:40 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 18:08:40 +0000 |
| commit | 4f999134a2e270792abc8b5ac6ad70aa500dcef4 (patch) | |
| tree | e90d972ee2f29d10d6e22220d54cd142925bb2bb /webkit/tools/test_shell | |
| parent | b5cd43eb964e452d7a0245b9e14bd9a9d1e89b4a (diff) | |
| download | chromium_src-4f999134a2e270792abc8b5ac6ad70aa500dcef4.zip chromium_src-4f999134a2e270792abc8b5ac6ad70aa500dcef4.tar.gz chromium_src-4f999134a2e270792abc8b5ac6ad70aa500dcef4.tar.bz2 | |
Use WebScriptSource and WebFindInPageRequest from the WebKit API.
This change introduces some helper functions in glue_util.cc for efficient
conversion between WebString and WebCore::String when inside the implementation
of webkit/glue. This is a temporary change since eventually all code in glue
that uses WebCore will be moved into the WebKit API implementation.
Instead of making the Chrome automation use WebFindInPageRequest, I decided to
introduce AutomationMsg_Find_Params as a copy of the old FindInPageRequest
structure. That preserves the IPC protocol and avoids making the automation
library depend on WebKit.
R=dglazkov
Review URL: http://codereview.chromium.org/57060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
| -rw-r--r-- | webkit/tools/test_shell/plugin_tests.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/plugin_tests.cc b/webkit/tools/test_shell/plugin_tests.cc index e672c7b..64824e4 100644 --- a/webkit/tools/test_shell/plugin_tests.cc +++ b/webkit/tools/test_shell/plugin_tests.cc @@ -8,12 +8,14 @@ #include "base/path_service.h" #include "base/string_util.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h" #include "webkit/glue/webframe.h" -#include "webkit/glue/webscriptsource.h" #include "webkit/glue/webview.h" #include "webkit/tools/test_shell/test_shell.h" #include "webkit/tools/test_shell/test_shell_test.h" +using WebKit::WebScriptSource; +using WebKit::WebString; // Provides functionality for creating plugin tests. class PluginTest : public TestShellTest { @@ -69,8 +71,10 @@ TEST_F(PluginTest, DISABLED_Refresh) { test_shell_->WaitTestFinished(); std::wstring text; - webkit_glue::WebScriptSource call_check("check();"); - webkit_glue::WebScriptSource refresh("navigator.plugins.refresh(false)"); + WebScriptSource call_check( + WebString::fromUTF8("check();")); + WebScriptSource refresh( + WebString::fromUTF8("navigator.plugins.refresh(false)")); test_shell_->webView()->GetMainFrame()->ExecuteScript(call_check); test_shell_->webView()->GetMainFrame()->GetContentAsPlainText(10000, &text); |