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

third_party/WebKit/Source/web/tests/FrameLoaderClientImplTest.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 56 matching lines @@
         // FIXME: http://crbug.com/363843. This needs to find a better way to
         // not create graphics layers.
         m_webView->settings()->setAcceleratedCompositingEnabled(false);
         m_mainFrame = WebLocalFrame::create(WebTreeScopeType::Document, &m_webFrameClient);
         m_webView->setMainFrame(m_mainFrame);
     }
 
     void TearDown() override
     {
         m_webView->close();
+        m_mainFrame->close();
     }
 
     WebString userAgent()
     {
         // The test always returns the same user agent .
         WTF::CString userAgent = frameLoaderClient().userAgent().utf8();
         return WebString::fromUTF8(userAgent.data(), userAgent.length());
     }
 
     WebLocalFrameImpl* mainFrame() { return toWebLocalFrameImpl(m_webView->mainFrame()); }
     Document& document() { return *toWebLocalFrameImpl(m_mainFrame)->frame()->document(); }
     MockWebFrameClient& webFrameClient() { return m_webFrameClient; }
     FrameLoaderClient& frameLoaderClient() { return *toFrameLoaderClientImpl(toWebLocalFrameImpl(m_webView->mainFrame())->frame()->loader().client()); }
 
 private:
     MockWebFrameClient m_webFrameClient;
     WebView* m_webView;
-    WebLocalFrame* m_mainFrame;
+    WebFrame* m_mainFrame;
 };
 
 TEST_F(FrameLoaderClientImplTest, UserAgentOverride)
 {
     const WebString defaultUserAgent = userAgent();
     const WebString overrideUserAgent = WebString::fromUTF8("dummy override");
 
     // Override the user agent and make sure we get it back.
     EXPECT_CALL(webFrameClient(), userAgentOverride()).WillOnce(Return(overrideUserAgent));
     EXPECT_TRUE(overrideUserAgent.equals(userAgent()));
     Mock::VerifyAndClearExpectations(&webFrameClient());
 
     // Remove the override and make sure we get the original back.
     EXPECT_CALL(webFrameClient(), userAgentOverride()).WillOnce(Return(WebString()));
     EXPECT_TRUE(defaultUserAgent.equals(userAgent()));
 }
 
 } // namespace
 } // namespace blink