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

Unified Diff: third_party/WebKit/Source/core/dom/DocumentTest.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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
Index: third_party/WebKit/Source/core/dom/DocumentTest.cpp
diff --git a/third_party/WebKit/Source/core/dom/DocumentTest.cpp b/third_party/WebKit/Source/core/dom/DocumentTest.cpp
index 3ab50aee52d67afe271255a2e1bf51fe3e0493a7..fd14fd9cf860ae6faa164395123b08bb501ca3c6 100644
--- a/third_party/WebKit/Source/core/dom/DocumentTest.cpp
+++ b/third_party/WebKit/Source/core/dom/DocumentTest.cpp
@@ -76,13 +76,13 @@ void DocumentTest::setHtmlInnerHTML(const char* htmlContent)
}
class MockDocumentVisibilityObserver
- : public NoBaseWillBeGarbageCollectedFinalized<MockDocumentVisibilityObserver>
+ : public GarbageCollectedFinalized<MockDocumentVisibilityObserver>
, public DocumentVisibilityObserver {
- WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MockDocumentVisibilityObserver);
+ USING_GARBAGE_COLLECTED_MIXIN(MockDocumentVisibilityObserver);
public:
- static PassOwnPtrWillBeRawPtr<MockDocumentVisibilityObserver> create(Document& document)
+ static RawPtr<MockDocumentVisibilityObserver> create(Document& document)
{
- return adoptPtrWillBeNoop(new MockDocumentVisibilityObserver(document));
+ return new MockDocumentVisibilityObserver(document);
}
DEFINE_INLINE_VIRTUAL_TRACE()
@@ -100,10 +100,10 @@ private:
TEST_F(DocumentTest, VisibilityOberver)
{
page().setVisibilityState(PageVisibilityStateVisible, true); // initial state
- OwnPtrWillBeRawPtr<MockDocumentVisibilityObserver> observer1 = MockDocumentVisibilityObserver::create(document());
+ RawPtr<MockDocumentVisibilityObserver> observer1 = MockDocumentVisibilityObserver::create(document());
{
- OwnPtrWillBeRawPtr<MockDocumentVisibilityObserver> observer2 = MockDocumentVisibilityObserver::create(document());
+ RawPtr<MockDocumentVisibilityObserver> observer2 = MockDocumentVisibilityObserver::create(document());
EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
EXPECT_CALL(*observer1, didChangeVisibilityState(PageVisibilityStateVisible)).Times(0);
EXPECT_CALL(*observer2, didChangeVisibilityState(PageVisibilityStateHidden)).Times(0);
@@ -193,13 +193,13 @@ TEST_F(DocumentTest, LinkManifest)
EXPECT_EQ(0, document().linkManifest());
// Check that we use the first manifest with <link rel=manifest>
- RefPtrWillBeRawPtr<HTMLLinkElement> link = HTMLLinkElement::create(document(), false);
+ RawPtr<HTMLLinkElement> link = HTMLLinkElement::create(document(), false);
link->setAttribute(blink::HTMLNames::relAttr, "manifest");
link->setAttribute(blink::HTMLNames::hrefAttr, "foo.json");
document().head()->appendChild(link);
EXPECT_EQ(link, document().linkManifest());
- RefPtrWillBeRawPtr<HTMLLinkElement> link2 = HTMLLinkElement::create(document(), false);
+ RawPtr<HTMLLinkElement> link2 = HTMLLinkElement::create(document(), false);
link2->setAttribute(blink::HTMLNames::relAttr, "manifest");
link2->setAttribute(blink::HTMLNames::hrefAttr, "bar.json");
document().head()->insertBefore(link2, link.get());

Powered by Google App Engine
This is Rietveld 408576698