summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/plugin_tests.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/test_shell/plugin_tests.cc')
-rw-r--r--webkit/tools/test_shell/plugin_tests.cc10
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);