Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 22 matching lines @@
 
 #include "SkFontMgr.h"
 #include "SkTypeface_win.h"
 #include "platform/Language.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontFaceCreationParams.h"
 #include "platform/fonts/FontPlatformData.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/win/FontFallbackWin.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 HashMap<String, RefPtr<SkTypeface>>* FontCache::s_sideloadedFonts = 0;
 
 // Cached system font metrics.
 AtomicString* FontCache::s_menuFontFamilyName = 0;
 int32_t FontCache::s_menuFontHeight = 0;
 AtomicString* FontCache::s_smallCaptionFontFamilyName = 0;
 int32_t FontCache::s_smallCaptionFontHeight = 0;
@@ skipping 295 matching lines @@
             familyName.truncate(family.length() - entry.length);
             adjustedName = AtomicString(familyName);
             variantStretch = entry.stretch;
             return true;
         }
     }
 
     return false;
 }
 
-std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
+PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
     const FontFaceCreationParams& creationParams, float fontSize)
 {
     ASSERT(creationParams.creationType() == CreateFontByFamily);
 
     CString name;
     RefPtr<SkTypeface> tf = createTypeface(fontDescription, creationParams, name);
     // Windows will always give us a valid pointer here, even if the face name
     // is non-existent. We have to double-check and see if the family name was
     // really used.
     if (!tf || !typefacesMatchesFamily(tf.get(), creationParams.family())) {
@@ skipping 17 matching lines @@
             adjustedFontDescription.setStretch(variantStretch);
             tf = createTypeface(adjustedFontDescription, adjustedParams, name);
             if (!tf || !typefacesMatchesFamily(tf.get(), adjustedName))
                 return nullptr;
 
         } else {
             return nullptr;
         }
     }
 
-    std::unique_ptr<FontPlatformData> result = wrapUnique(new FontPlatformData(tf,
+    OwnPtr<FontPlatformData> result = adoptPtr(new FontPlatformData(tf,
         name.data(),
         fontSize,
         (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDescription.isSyntheticBold(),
         ((fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
         fontDescription.orientation()));
 
     struct FamilyMinSize {
         const wchar_t* family;
         unsigned minSize;
     };
@@ skipping 38 matching lines @@
         if (typefacesMatchesFamily(tf.get(), family)) {
             result->setMinSizeForSubpixel(minSizeForSubpixelForFont);
             break;
         }
     }
 
     return result;
 }
 
 } // namespace blink