From fba88d3b3c5c0640b55effac84b1314760f46bf1 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Sun, 11 Sep 2016 14:47:29 -0700
Subject: [PATCH] Switch minikin to std::unique_ptr.

Bug: http://b/22403888
Change-Id: I9e18496fcc38ad2e6b922455daa9f2a46778ec55
---
 engine/src/flutter/include/minikin/SparseBitSet.h | 7 ++++---
 engine/src/flutter/libs/minikin/FontFamily.cpp    | 1 -
 engine/src/flutter/libs/minikin/Layout.cpp        | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/engine/src/flutter/include/minikin/SparseBitSet.h b/engine/src/flutter/include/minikin/SparseBitSet.h
index 72b83057c6..81f67c8f96 100644
--- a/engine/src/flutter/include/minikin/SparseBitSet.h
+++ b/engine/src/flutter/include/minikin/SparseBitSet.h
@@ -19,7 +19,8 @@
 
 #include <stdint.h>
 #include <sys/types.h>
-#include <UniquePtr.h>
+
+#include <memory>
 
 // ---------------------------------------------------------------------------
 
@@ -79,8 +80,8 @@ private:
     static int CountLeadingZeros(element x);
 
     uint32_t mMaxVal;
-    UniquePtr<uint32_t[]> mIndices;
-    UniquePtr<element[]> mBitmaps;
+    std::unique_ptr<uint32_t[]> mIndices;
+    std::unique_ptr<element[]> mBitmaps;
     uint32_t mZeroPageIndex;
 };
 
diff --git a/engine/src/flutter/libs/minikin/FontFamily.cpp b/engine/src/flutter/libs/minikin/FontFamily.cpp
index e2d86f0bbb..7a8e79f508 100644
--- a/engine/src/flutter/libs/minikin/FontFamily.cpp
+++ b/engine/src/flutter/libs/minikin/FontFamily.cpp
@@ -34,7 +34,6 @@
 #include <minikin/AnalyzeStyle.h>
 #include <minikin/CmapCoverage.h>
 #include <minikin/FontFamily.h>
-#include <UniquePtr.h>
 
 using std::vector;
 
diff --git a/engine/src/flutter/libs/minikin/Layout.cpp b/engine/src/flutter/libs/minikin/Layout.cpp
index 9c1d6a873a..5ba72a4bb2 100644
--- a/engine/src/flutter/libs/minikin/Layout.cpp
+++ b/engine/src/flutter/libs/minikin/Layout.cpp
@@ -496,7 +496,8 @@ private:
     size_t mRunCount;
     bool mIsRtl;
 
-    DISALLOW_COPY_AND_ASSIGN(BidiText);
+    BidiText(const BidiText&) = delete;
+    void operator=(const BidiText&) = delete;
 };
 
 BidiText::Iter::Iter(UBiDi* bidi, size_t start, size_t end, size_t runIndex, size_t runCount,