Make the embedder responsible for creating the WebFrame

Source/web/tests/RenderLayerBackingTest.cpp

 /*
  * Copyright (C) 2013 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 57 matching lines @@
 class MockWebFrameClient : public WebFrameClient {
 };
 
 class RenderLayerBackingTest : public testing::Test {
 public:
     RenderLayerBackingTest()
         : m_baseURL("http://www.test.com/")
     {
         // We cannot reuse FrameTestHelpers::createWebViewAndLoad here because the compositing
         // settings need to be set before the page is loaded.
+        m_mainFrame = WebFrame::create(&m_mockWebFrameClient);
         m_webViewImpl = toWebViewImpl(WebView::create(&m_mockWebViewClient));
         m_webViewImpl->settings()->setForceCompositingMode(true);
         m_webViewImpl->settings()->setAcceleratedCompositingEnabled(true);
         m_webViewImpl->settings()->setAcceleratedCompositingForFixedPositionEnabled(true);
         m_webViewImpl->settings()->setAcceleratedCompositingForOverflowScrollEnabled(true);
         m_webViewImpl->settings()->setAcceleratedCompositingForScrollableFramesEnabled(true);
         m_webViewImpl->settings()->setCompositedScrollingForFramesEnabled(true);
         m_webViewImpl->settings()->setFixedPositionCreatesStackingContext(true);
-        m_webViewImpl->initializeMainFrame(&m_mockWebFrameClient);
+        m_webViewImpl->setMainFrame(m_mainFrame);
         m_webViewImpl->resize(IntSize(320, 240));
     }
 
     virtual void TearDown()
     {
         Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
         m_webViewImpl->close();
+        m_mainFrame->close();
     }
 
     void navigateTo(const std::string& url)
     {
         FrameTestHelpers::loadFrame(m_webViewImpl->mainFrame(), url);
         Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     }
 
     void registerMockedHttpURLLoad(const std::string& fileName)
     {
         URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8(fileName.c_str()));
     }
 
 protected:
     std::string m_baseURL;
     MockWebFrameClient m_mockWebFrameClient;
     MockWebViewClient m_mockWebViewClient;
     WebViewImpl* m_webViewImpl;
+    WebFrame* m_mainFrame;
 };
 
 TEST_F(RenderLayerBackingTest, DISABLED_GraphicsLayerBackgroundColor)
 {
     registerMockedHttpURLLoad("layer_background_color.html");
     navigateTo(m_baseURL + "layer_background_color.html");
     m_webViewImpl->layout();
 
     Document* document = m_webViewImpl->mainFrameImpl()->frame()->document();
     Element* layerElement = document->getElementById("layer");
     RenderLayerModelObject* renderer = toRenderLayerModelObject(layerElement->renderer());
     EXPECT_EQ(renderer->style()->visitedDependentColor(CSSPropertyBackgroundColor),
               renderer->layer()->backing()->graphicsLayer()->backgroundColor());
 
     layerElement = document->getElementById("layer-solid-color");
     renderer = toRenderLayerModelObject(layerElement->renderer());
     // RenderLayerBacking::graphicsLayer's background color is unset if SolidColorLayer is created.
     EXPECT_EQ(Color(), renderer->layer()->backing()->graphicsLayer()->backgroundColor());
 }
 
 }
 
 } // namespace WebCore