commit 657ede9b05023bac1bc81da108c39cb11b2e00e7
author Justin Yun <justinyun@google.com> Wed Aug 16 20:47:07 2017 +0900
committer Justin Yun <justinyun@google.com> Thu Aug 17 14:55:57 2017 +0900
tree 6bfad5083bccdd9d42d33e1c687fee4350afd4b1
parent 31a32da463daf70a63c2fd7ee260b129d890c16a

gatekeeper: use std::unique_ptr

std::unique_ptr is available in this scope. Substitue the UniquePtr to
std::unique_ptr.

Bug: 63686260
Test: build and boot
Change-Id: I6ac682860e4d4dd3e413f50783b9d8f7806e1ae4

gatekeeper/SoftGateKeeper.h

diff --git a/gatekeeper/SoftGateKeeper.h b/gatekeeper/SoftGateKeeper.h
index cb02a6f..2f4f4d7 100644
--- a/gatekeeper/SoftGateKeeper.h
+++ b/gatekeeper/SoftGateKeeper.h
@@ -26,11 +26,11 @@
 }
 
 #include <android-base/memory.h>
-#include <UniquePtr.h>
 #include <gatekeeper/gatekeeper.h>
 
 #include <iostream>
 #include <unordered_map>
+#include <memory>
 
 namespace gatekeeper {
 
@@ -173,7 +173,7 @@
     typedef std::unordered_map<uint32_t, failure_record_t> FailureRecordMap;
     typedef std::unordered_map<uint64_t, fast_hash_t> FastHashMap;
 
-    UniquePtr<uint8_t[]> key_;
+    std::unique_ptr<uint8_t[]> key_;
     FailureRecordMap failure_map_;
     FastHashMap fast_hash_map_;
 };

gatekeeper/SoftGateKeeperDevice.h

diff --git a/gatekeeper/SoftGateKeeperDevice.h b/gatekeeper/SoftGateKeeperDevice.h
index 60ed44d..af3a1bc 100644
--- a/gatekeeper/SoftGateKeeperDevice.h
+++ b/gatekeeper/SoftGateKeeperDevice.h
@@ -19,7 +19,7 @@
 
 #include "SoftGateKeeper.h"
 
-#include <UniquePtr.h>
+#include <memory>
 
 using namespace gatekeeper;
 
@@ -68,7 +68,7 @@
             const uint8_t *provided_password, uint32_t provided_password_length,
             uint8_t **auth_token, uint32_t *auth_token_length, bool *request_reenroll);
 private:
-    UniquePtr<SoftGateKeeper> impl_;
+    std::unique_ptr<SoftGateKeeper> impl_;
 };
 
 } // namespace gatekeeper