Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(292)

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 1750613002: Retire WebLocalFrameScope. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove WebLocalFrameScope Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index 41c5d4ceca6bb00dd13deb53123347df96b8b7f9..3b3b2a13dfe54d1b7447dd49295b1af3cc17d950 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -7977,33 +7977,6 @@ TEST_P(DeviceEmulationTest, PointerAndHoverTypes)
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;
@@ -8012,10 +7985,10 @@ TEST_P(ParameterizedWebFrameTest, CreateLocalChildWithPreviousSibling)
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());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698