Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp

Index: third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp
diff --git a/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp b/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp
index a03522209e5eea4db2602d0f332e0b1c692e158e..925ad85e035378adb8835741d78ef7641376c3c5 100644
--- a/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp
+++ b/third_party/WebKit/Source/core/css/invalidation/InvalidationSet.cpp
@@ -35,9 +35,7 @@
 #include "core/inspector/InspectorTraceEvents.h"
 #include "platform/TracedValue.h"
 #include "wtf/Compiler.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/StringBuilder.h"
-#include <memory>
 
 namespace blink {
 
@@ -170,28 +168,28 @@ void InvalidationSet::destroy()
 HashSet<AtomicString>& InvalidationSet::ensureClassSet()
 {
     if (!m_classes)
-        m_classes = wrapUnique(new HashSet<AtomicString>);
+        m_classes = adoptPtr(new HashSet<AtomicString>);
     return *m_classes;
 }
 
 HashSet<AtomicString>& InvalidationSet::ensureIdSet()
 {
     if (!m_ids)
-        m_ids = wrapUnique(new HashSet<AtomicString>);
+        m_ids = adoptPtr(new HashSet<AtomicString>);
     return *m_ids;
 }
 
 HashSet<AtomicString>& InvalidationSet::ensureTagNameSet()
 {
     if (!m_tagNames)
-        m_tagNames = wrapUnique(new HashSet<AtomicString>);
+        m_tagNames = adoptPtr(new HashSet<AtomicString>);
     return *m_tagNames;
 }
 
 HashSet<AtomicString>& InvalidationSet::ensureAttributeSet()
 {
     if (!m_attributes)
-        m_attributes = wrapUnique(new HashSet<AtomicString>);
+        m_attributes = adoptPtr(new HashSet<AtomicString>);
     return *m_attributes;
 }
 
@@ -290,7 +288,7 @@ void InvalidationSet::toTracedValue(TracedValue* value) const
 #ifndef NDEBUG
 void InvalidationSet::show() const
 {
-    std::unique_ptr<TracedValue> value = TracedValue::create();
+    OwnPtr<TracedValue> value = TracedValue::create();
     value->beginArray("InvalidationSet");
     toTracedValue(value.get());
     value->endArray();