Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / tests / WebPluginContainerTest.cpp

diff --git a/src/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp b/src/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
index 973d45d..77045ec 100644 (file)
--- a/src/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
+++ b/src/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
@@ -29,27 +29,27 @@
  */
 
 #include "config.h"
-#include "WebPluginContainer.h"
+#include "public/web/WebPluginContainer.h"
 
-#include <gtest/gtest.h>
-#include "FakeWebPlugin.h"
-#include "FrameTestHelpers.h"
-#include "URLTestHelpers.h"
-#include "WebDocument.h"
-#include "WebElement.h"
-#include "WebFrame.h"
-#include "WebFrameClient.h"
-#include "WebFrameImpl.h"
-#include "WebPluginContainerImpl.h"
-#include "WebPluginParams.h"
-#include "WebSettings.h"
-#include "WebView.h"
-#include "WebViewImpl.h"
 #include "core/dom/Element.h"
+#include "core/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebClipboard.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebUnitTestSupport.h"
+#include "public/web/WebDocument.h"
+#include "public/web/WebElement.h"
+#include "public/web/WebFrame.h"
+#include "public/web/WebFrameClient.h"
+#include "public/web/WebPluginParams.h"
+#include "public/web/WebSettings.h"
+#include "public/web/WebView.h"
+#include "web/WebLocalFrameImpl.h"
+#include "web/WebPluginContainerImpl.h"
+#include "web/WebViewImpl.h"
+#include "web/tests/FakeWebPlugin.h"
+#include "web/tests/FrameTestHelpers.h"
+#include <gtest/gtest.h>
 
 using namespace blink;
 
@@ -84,8 +84,8 @@ public:
     virtual WebString selectionAsMarkup() const { return WebString("y"); }
 };
 
-class TestPluginWebFrameClient : public WebFrameClient {
-    virtual WebPlugin* createPlugin(WebFrame* frame, const WebPluginParams& params) OVERRIDE
+class TestPluginWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
+    virtual WebPlugin* createPlugin(WebLocalFrame* frame, const WebPluginParams& params) OVERRIDE
     {
         if (params.mimeType == WebString::fromUTF8("application/x-webkit-test-webplugin"))
             return new TestPlugin(frame, params);