Make the embedder responsible for creating the WebFrame

Source/web/tests/AssociatedURLLoaderTest.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 73 matching lines @@
         WTF::String localPath = m_baseFilePath;
         localPath.append(filename);
         WebCore::KURL url = toKURL(urlRoot + filename.utf8().data());
         Platform::current()->unitTestSupport()->registerMockedURL(url, response, localPath);
         return url;
     }
 
     void SetUp()
     {
         m_webView = WebView::create(0);
-        m_webView->initializeMainFrame(&m_webFrameClient);
+        m_mainFrame = WebFrame::create(&m_webFrameClient);
+        m_webView->setMainFrame(m_mainFrame);
 
         std::string urlRoot = "http://www.test.com/";
         WebCore::KURL url = RegisterMockedUrl(urlRoot, "iframes_test.html");
         const char* iframeSupportFiles[] = {
             "invisible_iframe.html",
             "visible_iframe.html",
             "zero_sized_iframe.html",
         };
         for (size_t i = 0; i < arraysize(iframeSupportFiles); ++i) {
             RegisterMockedUrl(urlRoot, iframeSupportFiles[i]);
         }
 
         WebURLRequest request;
         request.initialize();
         request.setURL(url);
         m_webView->mainFrame()->loadRequest(request);
         serveRequests();
 
         Platform::current()->unitTestSupport()->unregisterMockedURL(url);
     }
 
     void TearDown()
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
         m_webView->close();
+        m_mainFrame->close();
     }
 
     void serveRequests()
     {
         Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     }
 
     WebURLLoader* createAssociatedURLLoader(const WebURLLoaderOptions options = WebURLLoaderOptions())
     {
         return m_webView->mainFrame()->createAssociatedURLLoader(options);
@@ skipping 137 matching lines @@
         EXPECT_TRUE(m_didFinishLoading);
 
         return !m_actualResponse.httpHeaderField(headerNameString).isEmpty();
     }
 
 protected:
     WTF::String m_baseFilePath;
     WTF::String m_frameFilePath;
     TestWebFrameClient m_webFrameClient;
     WebView* m_webView;
+    WebFrame* m_mainFrame;
 
     WebURLLoader* m_expectedLoader;
     WebURLResponse m_actualResponse;
     WebURLResponse m_expectedResponse;
     WebURLRequest m_expectedNewRequest;
     WebURLResponse m_expectedRedirectResponse;
     bool m_willSendRequest;
     bool m_didSendData;
     bool m_didReceiveResponse;
     bool m_didDownloadData;
@@ skipping 335 matching lines @@
     m_expectedLoader->loadAsynchronously(request, this);
     serveRequests();
     EXPECT_TRUE(m_didReceiveResponse);
     EXPECT_TRUE(m_didReceiveData);
     EXPECT_TRUE(m_didFinishLoading);
 
     EXPECT_FALSE(m_actualResponse.httpHeaderField(headerNameString).isEmpty());
 }
 
 }