Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaperTest.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/fonts/shaping/CachingWordShaper.h"
 
 #include "platform/fonts/CharacterRange.h"
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/GlyphBuffer.h"
 #include "platform/fonts/shaping/CachingWordShapeIterator.h"
 #include "platform/fonts/shaping/ShapeResultTestInfo.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 class CachingWordShaperTest : public ::testing::Test {
 protected:
     void SetUp() override
     {
         fontDescription.setComputedSize(12.0);
         fontDescription.setLocale("en");
         ASSERT_EQ(USCRIPT_LATIN, fontDescription.script());
         fontDescription.setGenericFamily(FontDescription::StandardFamily);
 
         font = Font(fontDescription);
         font.update(nullptr);
         ASSERT_TRUE(font.canShapeWordByWord());
         fallbackFonts = nullptr;
-        cache = wrapUnique(new ShapeCache());
+        cache = adoptPtr(new ShapeCache());
     }
 
     FontCachePurgePreventer fontCachePurgePreventer;
     FontDescription fontDescription;
     Font font;
-    std::unique_ptr<ShapeCache> cache;
+    OwnPtr<ShapeCache> cache;
     HashSet<const SimpleFontData*>* fallbackFonts;
     unsigned startIndex = 0;
     unsigned numGlyphs = 0;
     hb_script_t script = HB_SCRIPT_INVALID;
 };
 
 static inline const ShapeResultTestInfo* testInfo(
     RefPtr<const ShapeResult>& result)
 {
     return static_cast<const ShapeResultTestInfo*>(result.get());
@@ skipping 64 matching lines @@
 TEST_F(CachingWordShaperTest, CommonAccentLeftToRightFillGlyphBuffer)
 {
     // "/. ." with an accent mark over the first dot.
     const UChar str[] = { 0x2F, 0x301, 0x2E, 0x20, 0x2E, 0x0 };
     TextRun textRun(str, 5);
 
     CachingWordShaper shaper(cache.get());
     GlyphBuffer glyphBuffer;
     shaper.fillGlyphBuffer(&font, textRun, fallbackFonts, &glyphBuffer, 0, 3);
 
-    std::unique_ptr<ShapeCache> referenceCache = wrapUnique(new ShapeCache());
+    OwnPtr<ShapeCache> referenceCache = adoptPtr(new ShapeCache());
     CachingWordShaper referenceShaper(referenceCache.get());
     GlyphBuffer referenceGlyphBuffer;
     font.setCanShapeWordByWordForTesting(false);
     referenceShaper.fillGlyphBuffer(&font, textRun, fallbackFonts,
         &referenceGlyphBuffer, 0, 3);
 
     ASSERT_EQ(referenceGlyphBuffer.glyphAt(0), glyphBuffer.glyphAt(0));
     ASSERT_EQ(referenceGlyphBuffer.glyphAt(1), glyphBuffer.glyphAt(1));
     ASSERT_EQ(referenceGlyphBuffer.glyphAt(2), glyphBuffer.glyphAt(2));
 }
 
 // Tests that filling a glyph buffer for a specific range returns the same
 // results when shaping word by word as when shaping the full run in one go.
 TEST_F(CachingWordShaperTest, CommonAccentRightToLeftFillGlyphBuffer)
 {
     // "[] []" with an accent mark over the last square bracket.
     const UChar str[] = { 0x5B, 0x5D, 0x20, 0x5B, 0x301, 0x5D, 0x0 };
     TextRun textRun(str, 6);
     textRun.setDirection(RTL);
 
     CachingWordShaper shaper(cache.get());
     GlyphBuffer glyphBuffer;
     shaper.fillGlyphBuffer(&font, textRun, fallbackFonts, &glyphBuffer, 1, 6);
 
-    std::unique_ptr<ShapeCache> referenceCache = wrapUnique(new ShapeCache());
+    OwnPtr<ShapeCache> referenceCache = adoptPtr(new ShapeCache());
     CachingWordShaper referenceShaper(referenceCache.get());
     GlyphBuffer referenceGlyphBuffer;
     font.setCanShapeWordByWordForTesting(false);
     referenceShaper.fillGlyphBuffer(&font, textRun, fallbackFonts,
         &referenceGlyphBuffer, 1, 6);
 
     ASSERT_EQ(5u, referenceGlyphBuffer.size());
     ASSERT_EQ(referenceGlyphBuffer.size(), glyphBuffer.size());
 
     ASSERT_EQ(referenceGlyphBuffer.glyphAt(0), glyphBuffer.glyphAt(0));
@@ skipping 362 matching lines @@
     float periodsAndSpacesWidth = shaper.width(&font, periodsAndSpaces, nullptr, &periodsAndSpacesGlyphBounds);
 
     // The total width of periods and spaces should be longer than the width of periods alone.
     ASSERT_GT(periodsAndSpacesWidth, periodsWidth);
 
     // The glyph bounds of periods and spaces should be longer than the glyph bounds of periods alone.
     ASSERT_GT(periodsAndSpacesGlyphBounds.width(), periodsGlyphBounds.width());
 }
 
 } // namespace blink