Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/fonts/GlyphMetricsMap.h

 /*
  * Copyright (C) 2006, 2009 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
@@ skipping 16 matching lines @@
  */
 
 #ifndef GlyphMetricsMap_h
 #define GlyphMetricsMap_h
 
 #include "platform/fonts/Glyph.h"
 #include "platform/geometry/FloatRect.h"
 #include "wtf/Allocator.h"
 #include "wtf/Assertions.h"
 #include "wtf/HashMap.h"
-#include "wtf/PtrUtil.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/text/Unicode.h"
-#include <memory>
 
 namespace blink {
 
 const float cGlyphSizeUnknown = -1;
 
 template<class T> class GlyphMetricsMap {
     USING_FAST_MALLOC(GlyphMetricsMap);
     WTF_MAKE_NONCOPYABLE(GlyphMetricsMap);
 public:
     GlyphMetricsMap() : m_filledPrimaryPage(false) { }
@@ skipping 36 matching lines @@
             return &m_primaryPage;
         return locatePageSlowCase(pageNumber);
     }
 
     GlyphMetricsPage* locatePageSlowCase(unsigned pageNumber);
 
     static T unknownMetrics();
 
     bool m_filledPrimaryPage;
     GlyphMetricsPage m_primaryPage; // We optimize for the page that contains glyph indices 0-255.
-    std::unique_ptr<HashMap<int, std::unique_ptr<GlyphMetricsPage>>> m_pages;
+    OwnPtr<HashMap<int, OwnPtr<GlyphMetricsPage>>> m_pages;
 };
 
 template<> inline float GlyphMetricsMap<float>::unknownMetrics()
 {
     return cGlyphSizeUnknown;
 }
 
 template<> inline FloatRect GlyphMetricsMap<FloatRect>::unknownMetrics()
 {
     return FloatRect(0, 0, cGlyphSizeUnknown, cGlyphSizeUnknown);
 }
 
 template<class T> typename GlyphMetricsMap<T>::GlyphMetricsPage* GlyphMetricsMap<T>::locatePageSlowCase(unsigned pageNumber)
 {
     GlyphMetricsPage* page;
     if (!pageNumber) {
         ASSERT(!m_filledPrimaryPage);
         page = &m_primaryPage;
         m_filledPrimaryPage = true;
     } else {
         if (m_pages) {
             page = m_pages->get(pageNumber);
             if (page)
                 return page;
         } else {
-            m_pages = wrapUnique(new HashMap<int, std::unique_ptr<GlyphMetricsPage>>);
+            m_pages = adoptPtr(new HashMap<int, OwnPtr<GlyphMetricsPage>>);
         }
         page = new GlyphMetricsPage;
-        m_pages->set(pageNumber, wrapUnique(page));
+        m_pages->set(pageNumber, adoptPtr(page));
     }
 
     // Fill in the whole page with the unknown glyph information.
     for (unsigned i = 0; i < GlyphMetricsPage::size; i++)
         page->setMetricsForIndex(i, unknownMetrics());
 
     return page;
 }
 
 } // namespace blink
 
 #endif