Upstream version 7.36.149.0

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

diff --git a/src/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp b/src/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp
index b2d17cd..8460e43 100644 (file)
--- a/src/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp
+++ b/src/third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.cpp
@@ -30,13 +30,13 @@
 
 #include "config.h"
 
-#include "FrameLoaderClientImpl.h"
+#include "web/FrameLoaderClientImpl.h"
 
-#include "WebFrameClient.h"
-#include "WebFrameImpl.h"
-#include "WebView.h"
 #include "core/loader/FrameLoader.h"
 #include "platform/weborigin/KURL.h"
+#include "public/web/WebFrameClient.h"
+#include "public/web/WebView.h"
+#include "web/WebLocalFrameImpl.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
@@ -48,7 +48,7 @@ namespace {
 
 class TestWebFrameClient : public WebFrameClient {
 public:
-    WebString userAgentOverride(WebFrame* frame, const WebURL& url) OVERRIDE
+    WebString userAgentOverride(WebLocalFrame* frame, const WebURL& url) OVERRIDE
     {
         if (m_userAgentOverride.isEmpty())
             return WebString();
@@ -70,9 +70,9 @@ public:
     void SetUp()
     {
         m_webView = WebView::create(0);
-        m_mainFrame = WebFrame::create(&m_webFrameClient);
+        m_mainFrame = WebLocalFrame::create(&m_webFrameClient);
         m_webView->setMainFrame(m_mainFrame);
-        m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebFrameImpl(m_webView->mainFrame())->frame()->loader().client());
+        m_frameLoaderClientImpl = toFrameLoaderClientImpl(toWebLocalFrameImpl(m_webView->mainFrame())->frame()->loader().client());
     }
 
     void TearDown()