Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/DequeTest.cpp

 /*
  * Copyright (C) 2011 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY 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 "wtf/Deque.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/HashSet.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include <memory>
 
 namespace WTF {
 
 namespace {
 
 TEST(DequeTest, Basic)
 {
     Deque<int> intDeque;
     EXPECT_TRUE(intDeque.isEmpty());
@@ skipping 129 matching lines @@
 private:
     int m_i;
     int* m_destructNumber;
 };
 
 template <typename OwnPtrDeque>
 void ownPtrTest()
 {
     int destructNumber = 0;
     OwnPtrDeque deque;
-    deque.append(wrapUnique(new DestructCounter(0, &destructNumber)));
-    deque.append(wrapUnique(new DestructCounter(1, &destructNumber)));
+    deque.append(adoptPtr(new DestructCounter(0, &destructNumber)));
+    deque.append(adoptPtr(new DestructCounter(1, &destructNumber)));
     EXPECT_EQ(2u, deque.size());
 
-    std::unique_ptr<DestructCounter>& counter0 = deque.first();
+    OwnPtr<DestructCounter>& counter0 = deque.first();
     EXPECT_EQ(0, counter0->get());
     int counter1 = deque.last()->get();
     EXPECT_EQ(1, counter1);
     EXPECT_EQ(0, destructNumber);
 
     size_t index = 0;
     for (auto iter = deque.begin(); iter != deque.end(); ++iter) {
-        std::unique_ptr<DestructCounter>& refCounter = *iter;
+        OwnPtr<DestructCounter>& refCounter = *iter;
         EXPECT_EQ(index, static_cast<size_t>(refCounter->get()));
         EXPECT_EQ(index, static_cast<size_t>((*refCounter).get()));
         index++;
     }
     EXPECT_EQ(0, destructNumber);
 
     auto it = deque.begin();
     for (index = 0; index < deque.size(); ++index) {
-        std::unique_ptr<DestructCounter>& refCounter = *it;
+        OwnPtr<DestructCounter>& refCounter = *it;
         EXPECT_EQ(index, static_cast<size_t>(refCounter->get()));
         index++;
         ++it;
     }
     EXPECT_EQ(0, destructNumber);
 
     EXPECT_EQ(0, deque.first()->get());
     deque.removeFirst();
     EXPECT_EQ(1, deque.first()->get());
     EXPECT_EQ(1u, deque.size());
     EXPECT_EQ(1, destructNumber);
 
-    std::unique_ptr<DestructCounter> ownCounter1 = std::move(deque.first());
+    OwnPtr<DestructCounter> ownCounter1 = std::move(deque.first());
     deque.removeFirst();
     EXPECT_EQ(counter1, ownCounter1->get());
     EXPECT_EQ(0u, deque.size());
     EXPECT_EQ(1, destructNumber);
 
     ownCounter1.reset();
     EXPECT_EQ(2, destructNumber);
 
     size_t count = 1025;
     destructNumber = 0;
     for (size_t i = 0; i < count; ++i)
-        deque.prepend(wrapUnique(new DestructCounter(i, &destructNumber)));
+        deque.prepend(adoptPtr(new DestructCounter(i, &destructNumber)));
 
-    // Deque relocation must not destruct std::unique_ptr element.
+    // Deque relocation must not destruct OwnPtr element.
     EXPECT_EQ(0, destructNumber);
     EXPECT_EQ(count, deque.size());
 
     OwnPtrDeque copyDeque;
     deque.swap(copyDeque);
     EXPECT_EQ(0, destructNumber);
     EXPECT_EQ(count, copyDeque.size());
     EXPECT_EQ(0u, deque.size());
 
     copyDeque.clear();
     EXPECT_EQ(count, static_cast<size_t>(destructNumber));
 }
 
 TEST(DequeTest, OwnPtr)
 {
-    ownPtrTest<Deque<std::unique_ptr<DestructCounter>>>();
-    ownPtrTest<Deque<std::unique_ptr<DestructCounter>, 2>>();
+    ownPtrTest<Deque<OwnPtr<DestructCounter>>>();
+    ownPtrTest<Deque<OwnPtr<DestructCounter>, 2>>();
 }
 
 class MoveOnly {
 public:
     explicit MoveOnly(int i = 0)
         : m_i(i)
     { }
 
     MoveOnly(MoveOnly&& other)
         : m_i(other.m_i)
@@ skipping 345 matching lines @@
     EXPECT_EQ(0, counter);
 
     counter = 0;
     Deque<CountCopy, 1> yetAnother(std::move(deque)); // Move construction.
     EXPECT_EQ(0, counter);
 }
 
 } // anonymous namespace
 
 } // namespace WTF