Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/VectorTest.cpp

Index: third_party/WebKit/Source/wtf/VectorTest.cpp
diff --git a/third_party/WebKit/Source/wtf/VectorTest.cpp b/third_party/WebKit/Source/wtf/VectorTest.cpp
index f0d164d3aac1608a63f989e6e4eda09842288021..11e508c054504ae12d218367e89243be60a98270 100644
--- a/third_party/WebKit/Source/wtf/VectorTest.cpp
+++ b/third_party/WebKit/Source/wtf/VectorTest.cpp
@@ -27,7 +27,8 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/HashSet.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/text/WTFString.h"
 #include <memory>
 
@@ -161,17 +162,17 @@ private:
     int* m_destructNumber;
 };
 
-typedef WTF::Vector<std::unique_ptr<DestructCounter>> OwnPtrVector;
+typedef WTF::Vector<OwnPtr<DestructCounter>> OwnPtrVector;
 
 TEST(VectorTest, OwnPtr)
 {
     int destructNumber = 0;
     OwnPtrVector vector;
-    vector.append(wrapUnique(new DestructCounter(0, &destructNumber)));
-    vector.append(wrapUnique(new DestructCounter(1, &destructNumber)));
+    vector.append(adoptPtr(new DestructCounter(0, &destructNumber)));
+    vector.append(adoptPtr(new DestructCounter(1, &destructNumber)));
     EXPECT_EQ(2u, vector.size());
 
-    std::unique_ptr<DestructCounter>& counter0 = vector.first();
+    OwnPtr<DestructCounter>& counter0 = vector.first();
     ASSERT_EQ(0, counter0->get());
     int counter1 = vector.last()->get();
     ASSERT_EQ(1, counter1);
@@ -179,7 +180,7 @@ TEST(VectorTest, OwnPtr)
 
     size_t index = 0;
     for (OwnPtrVector::iterator iter = vector.begin(); iter != vector.end(); ++iter) {
-        std::unique_ptr<DestructCounter>* refCounter = iter;
+        OwnPtr<DestructCounter>* refCounter = iter;
         EXPECT_EQ(index, static_cast<size_t>(refCounter->get()->get()));
         EXPECT_EQ(index, static_cast<size_t>((*refCounter)->get()));
         index++;
@@ -187,7 +188,7 @@ TEST(VectorTest, OwnPtr)
     EXPECT_EQ(0, destructNumber);
 
     for (index = 0; index < vector.size(); index++) {
-        std::unique_ptr<DestructCounter>& refCounter = vector[index];
+        OwnPtr<DestructCounter>& refCounter = vector[index];
         EXPECT_EQ(index, static_cast<size_t>(refCounter->get()));
     }
     EXPECT_EQ(0, destructNumber);
@@ -199,7 +200,7 @@ TEST(VectorTest, OwnPtr)
     EXPECT_EQ(1u, vector.size());
     EXPECT_EQ(1, destructNumber);
 
-    std::unique_ptr<DestructCounter> ownCounter1 = std::move(vector[0]);
+    OwnPtr<DestructCounter> ownCounter1 = std::move(vector[0]);
     vector.remove(0);
     ASSERT_EQ(counter1, ownCounter1->get());
     ASSERT_EQ(0u, vector.size());
@@ -211,9 +212,9 @@ TEST(VectorTest, OwnPtr)
     size_t count = 1025;
     destructNumber = 0;
     for (size_t i = 0; i < count; i++)
-        vector.prepend(wrapUnique(new DestructCounter(i, &destructNumber)));
+        vector.prepend(adoptPtr(new DestructCounter(i, &destructNumber)));
 
-    // Vector relocation must not destruct std::unique_ptr element.
+    // Vector relocation must not destruct OwnPtr element.
     EXPECT_EQ(0, destructNumber);
     EXPECT_EQ(count, vector.size());