Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/dom/SelectorQuery.cpp

 /*
  * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 18 matching lines @@
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/css/SelectorChecker.h"
 #include "core/css/parser/CSSParser.h"
 #include "core/dom/Document.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/Node.h"
 #include "core/dom/StaticNodeList.h"
 #include "core/dom/shadow/ElementShadow.h"
 #include "core/dom/shadow/ShadowRoot.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 struct SingleElementSelectorQueryTrait {
     typedef Element* OutputType;
     static const bool shouldOnlyMatchFirstElement = true;
     ALWAYS_INLINE static void appendElement(OutputType& output, Element& element)
     {
         DCHECK(!output);
         output = &element;
@@ skipping 469 matching lines @@
             DCHECK_EQ(firstSelector.tagQName().namespaceURI(), nullAtom);
             break;
         default:
             break; // If we need another fast path, add here.
         }
     }
 
     findTraverseRootsAndExecute<SelectorQueryTrait>(rootNode, output);
 }
 
-std::unique_ptr<SelectorQuery> SelectorQuery::adopt(CSSSelectorList selectorList)
+PassOwnPtr<SelectorQuery> SelectorQuery::adopt(CSSSelectorList selectorList)
 {
-    return wrapUnique(new SelectorQuery(std::move(selectorList)));
+    return adoptPtr(new SelectorQuery(std::move(selectorList)));
 }
 
 SelectorQuery::SelectorQuery(CSSSelectorList selectorList)
 {
     m_selectorList = std::move(selectorList);
     m_selectors.initialize(m_selectorList);
 }
 
 bool SelectorQuery::matches(Element& element) const
 {
@@ skipping 10 matching lines @@
     return m_selectors.queryAll(rootNode);
 }
 
 Element* SelectorQuery::queryFirst(ContainerNode& rootNode) const
 {
     return m_selectors.queryFirst(rootNode);
 }
 
 SelectorQuery* SelectorQueryCache::add(const AtomicString& selectors, const Document& document, ExceptionState& exceptionState)
 {
-    HashMap<AtomicString, std::unique_ptr<SelectorQuery>>::iterator it = m_entries.find(selectors);
+    HashMap<AtomicString, OwnPtr<SelectorQuery>>::iterator it = m_entries.find(selectors);
     if (it != m_entries.end())
         return it->value.get();
 
     CSSSelectorList selectorList = CSSParser::parseSelector(CSSParserContext(document, nullptr), nullptr, selectors);
 
     if (!selectorList.first()) {
         exceptionState.throwDOMException(SyntaxError, "'" + selectors + "' is not a valid selector.");
         return nullptr;
     }
 
     const unsigned maximumSelectorQueryCacheSize = 256;
     if (m_entries.size() == maximumSelectorQueryCacheSize)
         m_entries.remove(m_entries.begin());
 
     return m_entries.add(selectors, SelectorQuery::adopt(std::move(selectorList))).storedValue->value.get();
 }
 
 void SelectorQueryCache::invalidate()
 {
     m_entries.clear();
 }
 
 } // namespace blink