Make the embedder responsible for creating the WebFrame

Source/web/tests/WebPageSerializerTest.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 48 matching lines @@
         m_supportedSchemes[0] = "http";
         m_supportedSchemes[1] = "https";
         m_supportedSchemes[2] = "file";
     }
 
 protected:
     virtual void SetUp()
     {
         // Create and initialize the WebView.
         m_webView = WebView::create(0);
-        m_webView->initializeMainFrame(&m_webFrameClient);
+        m_mainFrame = WebFrame::create(&m_webFrameClient);
+        m_webView->setMainFrame(m_mainFrame);
     }
 
     virtual void TearDown()
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
         m_webView->close();
+        m_mainFrame->close();
     }
 
     void registerMockedURLLoad(const std::string& url, const WebString& fileName)
     {
         URLTestHelpers::registerMockedURLLoad(toKURL(url), fileName, WebString::fromUTF8("pageserialization/"), WebString::fromUTF8("text/html"));
     }
 
     void loadURLInTopFrame(const WebURL& url)
     {
         WebURLRequest urlRequest;
@@ skipping 14 matching lines @@
     {
         for (size_t i = 0; i < urls.size(); i++)
             printf("%s\n", urls[i].spec().data());
     }
 
     WebView* m_webView;
     WebVector<WebCString> m_supportedSchemes;
 
 private:
     TestWebFrameClient m_webFrameClient;
+    WebFrame* m_mainFrame;
 };
 
 TEST_F(WebPageSerializerTest, HTMLNodes)
 {
     // Register the mocked frame and load it.
     WebURL topFrameURL = toKURL("http://www.test.com");
     registerMockedURLLoad("http://www.test.com", WebString::fromUTF8("simple_page.html"));
     registerMockedURLLoad("http://www.example.com/beautifull.css", WebString::fromUTF8("beautifull.css"));
     loadURLInTopFrame(topFrameURL);
 
@@ skipping 61 matching lines @@
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/innerFrame.png"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/flash.swf"));
     // FIXME: for some reason the following resources is missing on one of the bot
     //        causing the test to fail. Probably a plugin issue.
     // EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/music.mid"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/object.png"));
     EXPECT_TRUE(webVectorContains(resources, "http://www.test.com/embed.png"));
 }
 
 }