Upstream version 10.39.225.0

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

diff --git a/src/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp b/src/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
index 21971da..28a1595 100644 (file)
--- a/src/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
+++ b/src/third_party/WebKit/Source/web/tests/ChromeClientImplTest.cpp
@@ -30,13 +30,15 @@
 
 #include "config.h"
 
-#include "WebFrame.h"
-#include "WebFrameClient.h"
-#include "WebInputEvent.h"
-#include "WebView.h"
-#include "WebViewClient.h"
-#include "WebViewImpl.h"
 #include "core/page/Chrome.h"
+#include "core/page/Page.h"
+#include "public/web/WebFrameClient.h"
+#include "public/web/WebInputEvent.h"
+#include "public/web/WebLocalFrame.h"
+#include "public/web/WebView.h"
+#include "public/web/WebViewClient.h"
+#include "web/WebViewImpl.h"
+#include "web/tests/FrameTestHelpers.h"
 #include <gtest/gtest.h>
 
 using namespace blink;
@@ -52,12 +54,7 @@ void setCurrentInputEventForTest(const WebInputEvent* event)
 
 namespace {
 
-class TestWebWidgetClient : public WebWidgetClient {
-public:
-    ~TestWebWidgetClient() { }
-};
-
-class TestWebViewClient : public WebViewClient {
+class TestWebViewClient : public FrameTestHelpers::TestWebViewClient {
 public:
     explicit TestWebViewClient(WebNavigationPolicy* target) : m_target(target) { }
     ~TestWebViewClient() { }
@@ -88,7 +85,7 @@ protected:
     virtual void SetUp()
     {
         m_webView = toWebViewImpl(WebView::create(&m_webViewClient));
-        m_mainFrame = WebFrame::create(&m_webFrameClient);
+        m_mainFrame = WebLocalFrame::create(&m_webFrameClient);
         m_webView->setMainFrame(m_mainFrame);
         m_chromeClientImpl = toChromeClientImpl(&m_webView->page()->chrome().client());
         m_result = WebNavigationPolicyIgnore;
@@ -108,14 +105,14 @@ protected:
         event.button = button;
         setCurrentInputEventForTest(&event);
         m_chromeClientImpl->setScrollbarsVisible(!asPopup);
-        m_chromeClientImpl->show(WebCore::NavigationPolicyIgnore);
+        m_chromeClientImpl->show(NavigationPolicyIgnore);
         setCurrentInputEventForTest(0);
         return m_result;
     }
 
     bool isNavigationPolicyPopup()
     {
-        m_chromeClientImpl->show(WebCore::NavigationPolicyIgnore);
+        m_chromeClientImpl->show(NavigationPolicyIgnore);
         return m_result == WebNavigationPolicyNewPopup;
     }