Retire WebLocalFrameScope.

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

 /*
  * Copyright (C) 2010 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 7959 matching lines @@
 
 TEST_P(DeviceEmulationTest, PointerAndHoverTypes)
 {
     WebDeviceEmulationParams params;
     params.screenPosition = WebDeviceEmulationParams::Mobile;
     m_webViewHelper.webView()->enableDeviceEmulation(params);
     EXPECT_EQ("20x20", dumpSize("pointer"));
     m_webViewHelper.webView()->disableDeviceEmulation();
 }
 
-class WebLocalFrameScope final {
-    WTF_MAKE_NONCOPYABLE(WebLocalFrameScope);
-public:
-    explicit WebLocalFrameScope(WebLocalFrame* localFrame)
-        : m_localFrame(localFrame)
-    {
-    }
-
-    operator WebLocalFrame*() const
-    {
-        return m_localFrame;
-    }
-
-    WebLocalFrame* operator->() const
-    {
-        return m_localFrame;
-    }
-
-    ~WebLocalFrameScope()
-    {
-        m_localFrame->close();
-    }
-private:
-    WebLocalFrame* m_localFrame;
-};
-
-
 TEST_P(ParameterizedWebFrameTest, CreateLocalChildWithPreviousSibling)
 {
     FrameTestHelpers::TestWebViewClient viewClient;
     FrameTestHelpers::TestWebRemoteFrameClient remoteClient;
     WebView* view = WebView::create(&viewClient);
     view->setMainFrame(remoteClient.frame());
     WebRemoteFrame* parent = view->mainFrame()->toWebRemoteFrame();
 
-    WebLocalFrameScope secondFrame(FrameTestHelpers::createLocalChild(parent, "name2"));
-    WebLocalFrameScope fourthFrame(FrameTestHelpers::createLocalChild(parent, "name4", nullptr, secondFrame));
-    WebLocalFrameScope thirdFrame(FrameTestHelpers::createLocalChild(parent, "name3", nullptr, secondFrame));
-    WebLocalFrameScope firstFrame(FrameTestHelpers::createLocalChild(parent, "name1"));
+    WebLocalFrame* secondFrame(FrameTestHelpers::createLocalChild(parent, "name2"));
+    WebLocalFrame* fourthFrame(FrameTestHelpers::createLocalChild(parent, "name4", nullptr, secondFrame));
+    WebLocalFrame* thirdFrame(FrameTestHelpers::createLocalChild(parent, "name3", nullptr, secondFrame));
+    WebLocalFrame* firstFrame(FrameTestHelpers::createLocalChild(parent, "name1"));
 
     EXPECT_EQ(firstFrame, parent->firstChild());
     EXPECT_EQ(nullptr, firstFrame->previousSibling());
     EXPECT_EQ(secondFrame, firstFrame->nextSibling());
 
     EXPECT_EQ(firstFrame, secondFrame->previousSibling());
     EXPECT_EQ(thirdFrame, secondFrame->nextSibling());
 
     EXPECT_EQ(secondFrame, thirdFrame->previousSibling());
     EXPECT_EQ(fourthFrame, thirdFrame->nextSibling());
@@ skipping 499 matching lines @@
 }
 
 TEST_F(WebFrameVisibilityChangeTest, RemoteFrameParentVisibilityChange)
 {
     swapLocalFrameToRemoteFrame();
     executeScriptOnMainFrame(WebScriptSource("document.querySelector('iframe').parentElement.style.display = 'none';"));
     EXPECT_FALSE(remoteFrameClient()->isVisible());
 }
 
 } // namespace blink