Merge DOMSettableTokensList into DOMTokensList

third_party/WebKit/Source/core/html/HTMLOutputElement.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 21 matching lines @@
 
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/HTMLNames.h"
 
 namespace blink {
 
 inline HTMLOutputElement::HTMLOutputElement(Document& document, HTMLFormElement* form)
     : HTMLFormControlElement(HTMLNames::outputTag, document, form)
     , m_isDefaultValueMode(true)
     , m_defaultValue("")
-    , m_tokens(DOMSettableTokenList::create(this))
+    , m_tokens(DOMTokenList::create(this))
 {
 }
 
 HTMLOutputElement::~HTMLOutputElement()
 {
 #if !ENABLE(OILPAN)
     m_tokens->setObserver(nullptr);
 #endif
 }
 
@@ skipping 14 matching lines @@
 }
 
 void HTMLOutputElement::parseAttribute(const QualifiedName& name, const AtomicString& oldValue, const AtomicString& value)
 {
     if (name == HTMLNames::forAttr)
         setFor(value);
     else
         HTMLFormControlElement::parseAttribute(name, oldValue, value);
 }
 
-DOMSettableTokenList* HTMLOutputElement::htmlFor() const
+DOMTokenList* HTMLOutputElement::htmlFor() const
 {
     return m_tokens.get();
 }
 
 void HTMLOutputElement::setFor(const AtomicString& value)
 {
     m_tokens->setValue(value);
 }
 
 void HTMLOutputElement::childrenChanged(const ChildrenChange& change)
@@ skipping 48 matching lines @@
     // when the element's value mode flag to "default".
     if (m_isDefaultValueMode)
         setTextContent(value);
 }
 
 
 DEFINE_TRACE(HTMLOutputElement)
 {
     visitor->trace(m_tokens);
     HTMLFormControlElement::trace(visitor);
-    DOMSettableTokenListObserver::trace(visitor);
+    DOMTokenListObserver::trace(visitor);
 }
 
 } // namespace blink