Improve DEFINE_STATIC_LOCAL()'s handling of Blink GCed objects.

third_party/WebKit/Source/core/layout/LayoutTestHelper.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/layout/LayoutTestHelper.h"
 
 #include "core/frame/FrameHost.h"
 #include "core/html/HTMLIFrameElement.h"
 #include "platform/scroll/ScrollbarTheme.h"
 
 namespace blink {
 
 RenderingTest::RenderingTest(RawPtr<FrameLoaderClient> frameLoaderClient)
     : m_frameLoaderClient(frameLoaderClient) { }
 
 void RenderingTest::SetUp()
 {
     Page::PageClients pageClients;
     fillWithEmptyClients(pageClients);
-    DEFINE_STATIC_LOCAL(Persistent<EmptyChromeClient>, chromeClient, (EmptyChromeClient::create()));
-    pageClients.chromeClient = chromeClient.get();
+    DEFINE_STATIC_LOCAL(EmptyChromeClient, chromeClient, (EmptyChromeClient::create()));
+    pageClients.chromeClient = &chromeClient;
     m_pageHolder = DummyPageHolder::create(IntSize(800, 600), &pageClients, m_frameLoaderClient.release(), settingOverrider());
 
     Settings::setMockScrollbarsEnabled(true);
     RuntimeEnabledFeatures::setOverlayScrollbarsEnabled(true);
     EXPECT_TRUE(ScrollbarTheme::theme().usesOverlayScrollbars());
 
     // This ensures that the minimal DOM tree gets attached
     // correctly for tests that don't call setBodyInnerHTML.
     document().view()->updateAllLifecyclePhases();
 }
@@ skipping 27 matching lines @@
     static_cast<SingleChildFrameLoaderClient*>(document().frame()->client())->setChild(m_subframe.get());
     document().frame()->host()->incrementSubframeCount();
     Document& frameDocument = *iframe.contentDocument();
 
     frameDocument.setBaseURLOverride(KURL(ParsedURLString, "http://test.com"));
     frameDocument.body()->setInnerHTML(htmlContentOfIframe, ASSERT_NO_EXCEPTION);
     return frameDocument;
 }
 
 } // namespace blink