| Index: third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp b/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp
|
| index 78ea99c72b202d293acf9b7eb197919b99964765..4c7987ad8ca02870520d467bbb34255c7e1ca7c7 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLSelectElementTest.cpp
|
| @@ -21,7 +21,7 @@ protected:
|
|
|
| private:
|
| OwnPtr<DummyPageHolder> m_dummyPageHolder;
|
| - RefPtrWillBePersistent<HTMLDocument> m_document;
|
| + Persistent<HTMLDocument> m_document;
|
| };
|
|
|
| void HTMLSelectElementTest::SetUp()
|
| @@ -297,7 +297,7 @@ TEST_F(HTMLSelectElementTest, ActiveSelectionEndAfterOptionRemoval)
|
| document().documentElement()->setInnerHTML("<select><optgroup><option selected>o1</option></optgroup></select>", ASSERT_NO_EXCEPTION);
|
| document().view()->updateAllLifecyclePhases();
|
| HTMLSelectElement* select = toHTMLSelectElement(document().body()->firstChild());
|
| - RefPtrWillBeRawPtr<HTMLOptionElement> option = toHTMLOptionElement(select->firstChild()->firstChild());
|
| + RawPtr<HTMLOptionElement> option = toHTMLOptionElement(select->firstChild()->firstChild());
|
| EXPECT_EQ(1, select->activeSelectionEndListIndex());
|
| select->firstChild()->removeChild(option, ASSERT_NO_EXCEPTION);
|
| EXPECT_EQ(-1, select->activeSelectionEndListIndex());
|
| @@ -310,8 +310,8 @@ TEST_F(HTMLSelectElementTest, DefaultToolTip)
|
| document().documentElement()->setInnerHTML("<select size=4><option value="">Placeholder</option><optgroup><option>o2</option></optgroup></select>", ASSERT_NO_EXCEPTION);
|
| document().view()->updateAllLifecyclePhases();
|
| HTMLSelectElement* select = toHTMLSelectElement(document().body()->firstChild());
|
| - RefPtrWillBeRawPtr<Element> option = toElement(select->firstChild());
|
| - RefPtrWillBeRawPtr<Element> optgroup = toElement(option->nextSibling());
|
| + RawPtr<Element> option = toElement(select->firstChild());
|
| + RawPtr<Element> optgroup = toElement(option->nextSibling());
|
|
|
| EXPECT_EQ(String(), select->defaultToolTip()) << "defaultToolTip for SELECT without FORM and without required attribute should return null string.";
|
| EXPECT_EQ(select->defaultToolTip(), option->defaultToolTip());
|
| @@ -322,7 +322,7 @@ TEST_F(HTMLSelectElementTest, DefaultToolTip)
|
| EXPECT_EQ(select->defaultToolTip(), option->defaultToolTip());
|
| EXPECT_EQ(select->defaultToolTip(), optgroup->defaultToolTip());
|
|
|
| - RefPtrWillBeRawPtr<HTMLFormElement> form = HTMLFormElement::create(document());
|
| + RawPtr<HTMLFormElement> form = HTMLFormElement::create(document());
|
| document().body()->appendChild(form.get());
|
| form->appendChild(select);
|
| EXPECT_EQ("<<ValidationValueMissingForSelect>>", select->defaultToolTip()) << "defaultToolTip for SELECT with FORM and required attribute should return a valueMissing message.";
|
|
|