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

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

 /*
  * Copyright (C) 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 59 matching lines @@
     GetNavigationPolicyTest()
         : m_result(WebNavigationPolicyIgnore)
         , m_webViewClient(&m_result)
     {
     }
 
 protected:
     void SetUp() override
     {
         m_webView = toWebViewImpl(WebView::create(&m_webViewClient, WebPageVisibilityStateVisible));
-        m_webView->setMainFrame(WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient));
+        m_mainFrame = WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient);
+        m_webView->setMainFrame(m_mainFrame);
         m_chromeClientImpl = toChromeClientImpl(&m_webView->page()->chromeClient());
         m_result = WebNavigationPolicyIgnore;
     }
 
     void TearDown() override
     {
         m_webView->close();
+        m_mainFrame->close();
     }
 
     WebNavigationPolicy getNavigationPolicyWithMouseEvent(int modifiers, WebMouseEvent::Button button, bool asPopup)
     {
         WebMouseEvent event;
         event.modifiers = modifiers;
         event.type = WebInputEvent::MouseUp;
         event.button = button;
         setCurrentInputEventForTest(&event);
         m_chromeClientImpl->setScrollbarsVisible(!asPopup);
         m_chromeClientImpl->show(NavigationPolicyIgnore);
         setCurrentInputEventForTest(0);
         return m_result;
     }
 
     bool isNavigationPolicyPopup()
     {
         m_chromeClientImpl->show(NavigationPolicyIgnore);
         return m_result == WebNavigationPolicyNewPopup;
     }
 
 protected:
     WebNavigationPolicy m_result;
     TestWebViewClient m_webViewClient;
     WebViewImpl* m_webView;
+    WebFrame* m_mainFrame;
     FrameTestHelpers::TestWebFrameClient m_webFrameClient;
     Persistent<ChromeClientImpl> m_chromeClientImpl;
 };
 
 TEST_F(GetNavigationPolicyTest, LeftClick)
 {
     int modifiers = 0;
     WebMouseEvent::Button button = WebMouseEvent::Button::Left;
     bool asPopup = false;
     EXPECT_EQ(WebNavigationPolicyNewForegroundTab,
@@ skipping 148 matching lines @@
     {
         m_webView = toWebViewImpl(WebView::create(&m_webViewClient, WebPageVisibilityStateVisible));
         m_mainFrame = WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient);
         m_webView->setMainFrame(m_mainFrame);
         m_chromeClientImpl = toChromeClientImpl(&m_webView->page()->chromeClient());
     }
 
     void TearDown() override
     {
         m_webView->close();
+        m_mainFrame->close();
     }
 
     ViewCreatingClient m_webViewClient;
     WebViewImpl* m_webView;
-    WebLocalFrame* m_mainFrame;
+    WebFrame* m_mainFrame;
     FrameTestHelpers::TestWebFrameClient m_webFrameClient;
     Persistent<ChromeClientImpl> m_chromeClientImpl;
 };
 
 TEST_F(CreateWindowTest, CreateWindowFromDeferredPage)
 {
     m_webView->page()->setDefersLoading(true);
     LocalFrame* frame = toWebLocalFrameImpl(m_mainFrame)->frame();
     FrameLoadRequest request(frame->document());
     WindowFeatures features;
     EXPECT_EQ(nullptr, m_chromeClientImpl->createWindow(frame, request, features, NavigationPolicyNewForegroundTab));
     m_webView->page()->setDefersLoading(false);
 }
 
 } // namespace blink