Make the embedder responsible for creating the WebFrame

Source/web/tests/ChromeClientImplTest.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 <gtest/gtest.h>
 
 using namespace WebKit;
 
@@ skipping 37 matching lines @@
     GetNavigationPolicyTest()
         : m_result(WebNavigationPolicyIgnore)
         , m_webViewClient(&m_result)
     {
     }
 
 protected:
     virtual void SetUp()
     {
         m_webView = toWebViewImpl(WebView::create(&m_webViewClient));
-        m_webView->initializeMainFrame(&m_webFrameClient);
+        m_mainFrame = WebFrame::create(&m_webFrameClient);
+        m_webView->setMainFrame(m_mainFrame);
         m_chromeClientImpl = static_cast<ChromeClientImpl*>(&m_webView->page()->chrome().client());
         m_result = WebNavigationPolicyIgnore;
     }
 
     virtual void TearDown()
     {
         m_webView->close();
+        m_mainFrame->close();
     }
 
     WebNavigationPolicy getNavigationPolicyWithMouseEvent(int modifiers, WebMouseEvent::Button button, bool asPopup)
     {
         WebMouseEvent event;
         event.modifiers = modifiers;
         event.type = WebInputEvent::MouseUp;
         event.button = button;
         setCurrentInputEventForTest(&event);
         m_chromeClientImpl->setScrollbarsVisible(!asPopup);
         m_chromeClientImpl->show(WebCore::NavigationPolicyIgnore);
         setCurrentInputEventForTest(0);
         return m_result;
     }
 
     bool isNavigationPolicyPopup()
     {
         m_chromeClientImpl->show(WebCore::NavigationPolicyIgnore);
         return m_result == WebNavigationPolicyNewPopup;
     }
 
 protected:
     WebNavigationPolicy m_result;
     TestWebViewClient m_webViewClient;
     WebViewImpl* m_webView;
+    WebFrame* m_mainFrame;
     TestWebFrameClient m_webFrameClient;
     ChromeClientImpl* m_chromeClientImpl;
 };
 
 TEST_F(GetNavigationPolicyTest, LeftClick)
 {
     int modifiers = 0;
     WebMouseEvent::Button button = WebMouseEvent::ButtonLeft;
     bool asPopup = false;
     EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
@@ skipping 125 matching lines @@
 
 TEST_F(GetNavigationPolicyTest, NotResizableForcesPopup)
 {
     m_chromeClientImpl->setResizable(false);
     EXPECT_TRUE(isNavigationPolicyPopup());
     m_chromeClientImpl->setResizable(true);
     EXPECT_FALSE(isNavigationPolicyPopup());
 }
 
 } // namespace