Make collection caching code more consistent

Source/core/html/HTMLDataListElement.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2010 Apple 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.
@@ skipping 16 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/html/HTMLDataListElement.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/IdTargetObserverRegistry.h"
+#include "core/dom/NodeListsNodeData.h"
 #include "core/frame/UseCounter.h"
 
 namespace blink {
 
 inline HTMLDataListElement::HTMLDataListElement(Document& document)
     : HTMLElement(HTMLNames::datalistTag, document)
 {
     ScriptWrappable::init(this);
 }
 
 PassRefPtrWillBeRawPtr<HTMLDataListElement> HTMLDataListElement::create(Document& document)
 {
     UseCounter::count(document, UseCounter::DataListElement);
     return adoptRefWillBeNoop(new HTMLDataListElement(document));
 }
 
 PassRefPtrWillBeRawPtr<HTMLCollection> HTMLDataListElement::options()
 {
-    return ensureCachedHTMLCollection(DataListOptions);
+    return ensureCachedCollection<HTMLCollection>(DataListOptions);
 }
 
 void HTMLDataListElement::childrenChanged(const ChildrenChange& change)
 {
     HTMLElement::childrenChanged(change);
     if (!change.byParser)
         treeScope().idTargetObserverRegistry().notifyObservers(getIdAttribute());
 }
 
 void HTMLDataListElement::finishParsingChildren()
 {
     treeScope().idTargetObserverRegistry().notifyObservers(getIdAttribute());
 }
 
 void HTMLDataListElement::optionElementChildrenChanged()
 {
     treeScope().idTargetObserverRegistry().notifyObservers(getIdAttribute());
 }
 
 } // namespace blink