| Index: content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| index d12b45bdfc266f2dd64774557ec43f7cf9968175..fab51e5c4740996d1aa8dbf1b46603a7db47f5fd 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| @@ -61,7 +61,7 @@ class TestContentRendererClient : public ContentRendererClient {
|
| virtual ~TestContentRendererClient() {
|
| }
|
| virtual bool AllowBrowserPlugin(
|
| - WebKit::WebPluginContainer* container) OVERRIDE {
|
| + blink::WebPluginContainer* container) OVERRIDE {
|
| // Allow BrowserPlugin for tests.
|
| return true;
|
| }
|
| @@ -114,7 +114,7 @@ std::string BrowserPluginTest::ExecuteScriptAndReturnString(
|
| const std::string& script) {
|
| v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
|
| v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue(
|
| - WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str())));
|
| + blink::WebScriptSource(blink::WebString::fromUTF8(script.c_str())));
|
| if (value.IsEmpty() || !value->IsString())
|
| return std::string();
|
|
|
| @@ -129,7 +129,7 @@ int BrowserPluginTest::ExecuteScriptAndReturnInt(
|
| const std::string& script) {
|
| v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
|
| v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue(
|
| - WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str())));
|
| + blink::WebScriptSource(blink::WebString::fromUTF8(script.c_str())));
|
| if (value.IsEmpty() || !value->IsInt32())
|
| return 0;
|
|
|
| @@ -142,7 +142,7 @@ bool BrowserPluginTest::ExecuteScriptAndReturnBool(
|
| const std::string& script, bool* result) {
|
| v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
|
| v8::Handle<v8::Value> value = GetMainFrame()->executeScriptAndReturnValue(
|
| - WebKit::WebScriptSource(WebKit::WebString::fromUTF8(script.c_str())));
|
| + blink::WebScriptSource(blink::WebString::fromUTF8(script.c_str())));
|
| if (value.IsEmpty() || !value->IsBoolean())
|
| return false;
|
|
|
|
|