Make the embedder responsible for creating the WebFrame

Source/web/tests/WebPageNewSerializerTest.cpp

 /*
  * Copyright (C) 2011 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 97 matching lines @@
         , m_pngMimeType(WebString::fromUTF8("image/png"))
         , m_svgMimeType(WebString::fromUTF8("image/svg+xml"))
     {
     }
 
 protected:
     virtual void SetUp()
     {
         // Create and initialize the WebView.
         m_webView = WebView::create(0);
+        m_mainFrame = WebFrame::create(&m_webFrameClient);
 
         // We want the images to load and JavaScript to be on.
         WebSettings* settings = m_webView->settings();
         settings->setImagesEnabled(true);
         settings->setLoadsImagesAutomatically(true);
         settings->setJavaScriptEnabled(true);
 
-        m_webView->initializeMainFrame(&m_webFrameClient);
+        m_webView->setMainFrame(m_mainFrame);
     }
 
     virtual void TearDown()
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
         m_webView->close();
+        m_mainFrame->close();
     }
 
     WebURL setUpCSSTestPage()
     {
         WebURL topFrameURL = toKURL("http://www.test.com");
         registerMockedURLLoad(topFrameURL, WebString::fromUTF8("css_test_page.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/link_styles.css"), WebString::fromUTF8("link_styles.css"), WebString::fromUTF8("pageserializer/"), cssMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/import_style_from_link.css"), WebString::fromUTF8("import_style_from_link.css"), WebString::fromUTF8("pageserializer/"), cssMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/import_styles.css"), WebString::fromUTF8("import_styles.css"), WebString::fromUTF8("pageserializer/"), cssMimeType());
         registerMockedURLLoad(toKURL("http://www.test.com/red_background.png"), WebString::fromUTF8("red_background.png"), WebString::fromUTF8("pageserializer/"), pngMimeType());
@@ skipping 40 matching lines @@
 
     WebView* m_webView;
 
 private:
     WebString m_htmlMimeType;
     WebString m_xhtmlMimeType;
     WebString m_cssMimeType;
     WebString m_pngMimeType;
     WebString m_svgMimeType;
     TestWebFrameClient m_webFrameClient;
+    WebFrame* m_mainFrame;
 };
 
 // Tests that a page with resources and sub-frame is reported with all its resources.
 TEST_F(WebPageNewSerializeTest, PageWithFrames)
 {
     // Register the mocked frames.
     WebURL topFrameURL = toKURL("http://www.test.com");
     registerMockedURLLoad(topFrameURL, WebString::fromUTF8("top_frame.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toKURL("http://www.test.com/iframe.html"), WebString::fromUTF8("iframe.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
     registerMockedURLLoad(toKURL("http://www.test.com/iframe2.html"), WebString::fromUTF8("iframe2.html"), WebString::fromUTF8("pageserializer/"), htmlMimeType());
@@ skipping 226 matching lines @@
     // exactly two times.
     size_t nbDataURLs = 0;
     LineReader lineReader(std::string(mhtmlData.data()));
     std::string line;
     while (lineReader.getNextLine(&line)) {
         if (line.find("data:text") != std::string::npos)
             nbDataURLs++;
     }
     EXPECT_EQ(2u, nbDataURLs);
 }