Merge DOMSettableTokensList into DOMTokensList

third_party/WebKit/Source/core/html/HTMLOutputElement.cpp

Index: third_party/WebKit/Source/core/html/HTMLOutputElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp b/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp
index d274a515581f16e0256793e51edd313d818a13d1..38895eb2b004179bba5ab2f477777c46f4930762 100644
--- a/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLOutputElement.cpp
@@ -39,7 +39,7 @@ inline HTMLOutputElement::HTMLOutputElement(Document& document, HTMLFormElement*
     : HTMLFormControlElement(HTMLNames::outputTag, document, form)
     , m_isDefaultValueMode(true)
     , m_defaultValue("")
-    , m_tokens(DOMSettableTokenList::create(this))
+    , m_tokens(DOMTokenList::create(this))
 {
 }
 
@@ -74,7 +74,7 @@ void HTMLOutputElement::parseAttribute(const QualifiedName& name, const AtomicSt
         HTMLFormControlElement::parseAttribute(name, oldValue, value);
 }
 
-DOMSettableTokenList* HTMLOutputElement::htmlFor() const
+DOMTokenList* HTMLOutputElement::htmlFor() const
 {
     return m_tokens.get();
 }
@@ -143,7 +143,7 @@ DEFINE_TRACE(HTMLOutputElement)
 {
     visitor->trace(m_tokens);
     HTMLFormControlElement::trace(visitor);
-    DOMSettableTokenListObserver::trace(visitor);
+    DOMTokenListObserver::trace(visitor);
 }
 
 } // namespace blink