Revert of Require WebLocalFrame to be created with a non-null client

third_party/WebKit/Source/web/tests/WebViewTest.cpp

 /*
  * Copyright (C) 2011, 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 395 matching lines @@
 
 TEST_F(WebViewTest, SetBaseBackgroundColorBeforeMainFrame)
 {
     const WebColor kBlue = 0xFF0000FF;
     FrameTestHelpers::TestWebViewClient webViewClient;
     WebViewImpl* webView = WebViewImpl::create(&webViewClient, WebPageVisibilityStateVisible);
     EXPECT_NE(kBlue, webView->backgroundColor());
     // webView does not have a frame yet, but we should still be able to set the background color.
     webView->setBaseBackgroundColor(kBlue);
     EXPECT_EQ(kBlue, webView->backgroundColor());
-    FrameTestHelpers::TestWebFrameClient webFrameClient;
-    WebLocalFrame* frame = WebLocalFrame::create(WebTreeScopeType::Document, &webFrameClient);
+    WebLocalFrame* frame = WebLocalFrame::create(WebTreeScopeType::Document, nullptr);
     webView->setMainFrame(frame);
     webView->close();
+    frame->close();
 }
 
 TEST_F(WebViewTest, SetBaseBackgroundColorAndBlendWithExistingContent)
 {
     const WebColor kAlphaRed = 0x80FF0000;
     const WebColor kAlphaGreen = 0x8000FF00;
     const int kWidth = 100;
     const int kHeight = 100;
 
     WebViewImpl* webView = m_webViewHelper.initialize();
@@ skipping 1390 matching lines @@
     runPendingTasks();
     EXPECT_EQ(25, client.longpressX());
     EXPECT_EQ(7, client.longpressY());
 
     m_webViewHelper.reset(); // Explicitly reset to break dependency on locally scoped client.
 }
 
 TEST_F(WebViewTest, ClientTapHandlingNullWebViewClient)
 {
     WebViewImpl* webView = WebViewImpl::create(nullptr, WebPageVisibilityStateVisible);
-    FrameTestHelpers::TestWebFrameClient webFrameClient;
-    WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, &webFrameClient);
+    WebLocalFrame* localFrame = WebLocalFrame::create(WebTreeScopeType::Document, nullptr);
     webView->setMainFrame(localFrame);
     WebGestureEvent event;
     event.type = WebInputEvent::GestureTap;
     event.sourceDevice = WebGestureDeviceTouchscreen;
     event.x = 3;
     event.y = 8;
     EXPECT_EQ(WebInputEventResult::NotHandled, webView->handleInputEvent(event));
     webView->close();
+    // Explicitly close as the frame as no frame client to do so on frameDetached().
+    localFrame->close();
 }
 
 TEST_F(WebViewTest, LongPressEmptyDiv)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()),
         WebString::fromUTF8("long_press_empty_div.html"));
 
     WebViewImpl* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "long_press_empty_div.html", true);
     webView->settingsImpl()->setAlwaysShowContextMenuOnTouch(false);
     webView->resize(WebSize(500, 300));
@@ skipping 864 matching lines @@
     webView->updateAllLifecyclePhases();
     // Left upper corner of the rect will be end position in the DOM hierarchy.
     WebRect cropRect(30, 110, 400, 250);
     // This should not still crash. See crbug.com/589082 for more details.
     webView->extractSmartClipData(cropRect, clipText, clipHtml, clipRect);
 }
 
 class CreateChildCounterFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     CreateChildCounterFrameClient() : m_count(0) { }
-    WebLocalFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& name, const WebString& uniqueName, WebSandboxFlags, const WebFrameOwnerProperties&) override;
+    WebFrame* createChildFrame(WebLocalFrame* parent, WebTreeScopeType, const WebString& name, const WebString& uniqueName, WebSandboxFlags, const WebFrameOwnerProperties&) override;
 
     int count() const { return m_count; }
 
 private:
     int m_count;
 };
 
-WebLocalFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
+WebFrame* CreateChildCounterFrameClient::createChildFrame(WebLocalFrame* parent, WebTreeScopeType scope, const WebString& name, const WebString& uniqueName, WebSandboxFlags sandboxFlags, const WebFrameOwnerProperties& frameOwnerProperties)
 {
     ++m_count;
     return TestWebFrameClient::createChildFrame(parent, scope, name, uniqueName, sandboxFlags, frameOwnerProperties);
 }
 
 TEST_F(WebViewTest, ChangeDisplayMode)
 {
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(m_baseURL.c_str()), WebString::fromUTF8("display_mode.html"));
     WebView* webView = m_webViewHelper.initializeAndLoad(m_baseURL + "display_mode.html", true);
 
@@ skipping 972 matching lines @@
 
     // Transform adapts to page scale changes.
     webViewImpl->setPageScaleFactor(2.f);
     expectedMatrix.makeIdentity().scale(2.f).translate(-50, -55).translate(50, 55).scale(1. / 2.f);
     EXPECT_EQ(expectedMatrix, webViewImpl->getRootLayerTransformForTesting());
     // visibleContentRect doesn't change.
     EXPECT_EQ(IntRect(50, 55, 50, 75), *devToolsEmulator->visibleContentRectForPainting());
 }
 
 } // namespace blink