Replace scoped_ptr With std::unique_ptr

(This is a merge of http://go/wvgerrit/65782)

We have had our own scoped_ptr implementation that is used throughout
the codebase. Now that we support C++11, we can replace these with
std::unique_ptr.

Doing this replacement exposed a few places where the two were not
interchangeable. OEMCrypto Ref was doing some unsafe things with passing
scoped_ptrs to functions and has been updated to use move semantics. And
a few constructors were explicitly constructing a scoped_ptr with NULL,
which is ambiguous with std::unique_ptr. These have been replaced with
default constructor calls.

Bug: 111851141
Test: CE CDM Unit Tests
Test: Android Unit Tests
Change-Id: I37d6d7aad4906709381c74f0c5439f826d2be768

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -19,7 +19,6 @@
 #include "lock.h"
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
-#include "scoped_ptr.h"
 #include "service_certificate.h"
 #include "wv_cdm_constants.h"
 #include "wv_cdm_types.h"
@@ -325,7 +324,7 @@ class CdmEngine {
 
   CdmSessionMap session_map_;
   CdmReleaseKeySetMap release_key_sets_;
-  scoped_ptr<CertificateProvisioning> cert_provisioning_;
+  std::unique_ptr<CertificateProvisioning> cert_provisioning_;
   SecurityLevel cert_provisioning_requested_security_level_;
   FileSystem* file_system_;
   Clock clock_;
@@ -334,8 +333,8 @@ class CdmEngine {
   static bool seeded_;
 
   // usage related variables
-  scoped_ptr<CdmSession> usage_session_;
-  scoped_ptr<UsagePropertySet> usage_property_set_;
+  std::unique_ptr<CdmSession> usage_session_;
+  std::unique_ptr<UsagePropertySet> usage_property_set_;
   int64_t last_usage_information_update_time_;
 
   // Protect release_key_sets_ from non-thread-safe operations.

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -5,6 +5,7 @@
 #ifndef WVCDM_CORE_CDM_SESSION_H_
 #define WVCDM_CORE_CDM_SESSION_H_
 
+#include <memory>
 #include <set>
 #include <string>
 #include <vector>
@@ -18,7 +19,6 @@
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
 #include "policy_engine.h"
-#include "scoped_ptr.h"
 #include "timer_metric.h"
 #include "wv_cdm_types.h"
 
@@ -228,10 +228,10 @@ class CdmSession {
   bool closed_;  // Session closed, but final shared_ptr has not been released.
   CdmSessionId session_id_;
   FileSystem* file_system_;
-  scoped_ptr<CdmLicense> license_parser_;
-  scoped_ptr<CryptoSession> crypto_session_;
-  scoped_ptr<PolicyEngine> policy_engine_;
-  scoped_ptr<DeviceFiles> file_handle_;
+  std::unique_ptr<CdmLicense> license_parser_;
+  std::unique_ptr<CryptoSession> crypto_session_;
+  std::unique_ptr<PolicyEngine> policy_engine_;
+  std::unique_ptr<DeviceFiles> file_handle_;
   bool license_received_;
   bool is_offline_;
   bool is_release_;

libwvdrmengine/cdm/core/include/certificate_provisioning.h

@@ -5,6 +5,7 @@
 #ifndef WVCDM_CORE_CERTIFICATE_PROVISIONING_H_
 #define WVCDM_CORE_CERTIFICATE_PROVISIONING_H_
 
+#include <memory>
 #include <string>
 
 #include "crypto_session.h"
@@ -12,7 +13,6 @@
 #include "license_protocol.pb.h"
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
-#include "scoped_ptr.h"
 #include "service_certificate.h"
 #include "wv_cdm_types.h"
 
@@ -53,9 +53,9 @@ class CertificateProvisioning {
   video_widevine::SignedProvisioningMessage::ProtocolVersion
       GetProtocolVersion();
 
-  scoped_ptr<CryptoSession> crypto_session_;
+  std::unique_ptr<CryptoSession> crypto_session_;
   CdmCertificateType cert_type_;
-  scoped_ptr<ServiceCertificate> service_certificate_;
+  std::unique_ptr<ServiceCertificate> service_certificate_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CertificateProvisioning);
 };

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -6,6 +6,7 @@
 #define WVCDM_CORE_CRYPTO_SESSION_H_
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -15,7 +16,6 @@
 #include "lock.h"
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
-#include "scoped_ptr.h"
 #include "timer_metric.h"
 #include "wv_cdm_types.h"
 
@@ -295,7 +295,7 @@ class CryptoSession {
   SubLicenseSessionMap sub_license_oec_sessions_;
   // Used for sub license sessions.
   std::string wrapped_key_;
-  scoped_ptr<KeySession> key_session_;
+  std::unique_ptr<KeySession> key_session_;
 
   OEMCryptoBufferType destination_buffer_type_;
   bool is_destination_buffer_type_valid_;
@@ -313,7 +313,7 @@ class CryptoSession {
   CdmCipherMode cipher_mode_;
   uint32_t api_version_;
 
-  static scoped_ptr<CryptoSessionFactory> factory_;
+  static std::unique_ptr<CryptoSessionFactory> factory_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);
 };

libwvdrmengine/cdm/core/include/device_files.h

@@ -13,7 +13,6 @@
 
 #include "device_files.pb.h"
 #include "disallow_copy_and_assign.h"
-#include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
 #if defined(UNIT_TEST)

libwvdrmengine/cdm/core/include/license.h

@@ -5,12 +5,12 @@
 #ifndef WVCDM_CORE_LICENSE_H_
 #define WVCDM_CORE_LICENSE_H_
 
+#include <memory>
 #include <set>
 
 #include "disallow_copy_and_assign.h"
 #include "initialization_data.h"
 #include "license_protocol.pb.h"
-#include "scoped_ptr.h"
 #include "service_certificate.h"
 #include "wv_cdm_types.h"
 
@@ -121,7 +121,7 @@ class CdmLicense {
   CdmClientTokenType client_token_type_;
   std::string device_id_;
   const CdmSessionId session_id_;
-  scoped_ptr<InitializationData> stored_init_data_;
+  std::unique_ptr<InitializationData> stored_init_data_;
   bool initialized_;
   std::set<KeyId> loaded_keys_;
   std::string provider_session_token_;
@@ -135,7 +135,7 @@ class CdmLicense {
   // Used for certificate based licensing
   CdmKeyMessage key_request_;
 
-  scoped_ptr<Clock> clock_;
+  std::unique_ptr<Clock> clock_;
 
   // For testing
   // CdmLicense takes ownership of the clock.

libwvdrmengine/cdm/core/include/policy_engine.h

@@ -6,12 +6,12 @@
 #define WVCDM_CORE_POLICY_ENGINE_H_
 
 #include <map>
+#include <memory>
 #include <string>
 
 #include "disallow_copy_and_assign.h"
 #include "license_key_status.h"
 #include "license_protocol.pb.h"
-#include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
 namespace wvcdm {
@@ -212,14 +212,14 @@ class PolicyEngine {
 
   // Keys associated with license - holds allowed usage, usage constraints,
   // and current status (CdmKeyStatus)
-  scoped_ptr<LicenseKeys> license_keys_;
+  std::unique_ptr<LicenseKeys> license_keys_;
 
   // Device checks
   int64_t next_device_check_;
   uint32_t current_resolution_;
   CryptoSession* crypto_session_;
 
-  scoped_ptr<Clock> clock_;
+  std::unique_ptr<Clock> clock_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(PolicyEngine);
 };

libwvdrmengine/cdm/core/include/properties.h

@@ -6,12 +6,12 @@
 #define WVCDM_CORE_PROPERTIES_H_
 
 #include <map>
+#include <memory>
 #include <string>
 
 #include "cdm_client_property_set.h"
 #include "disallow_copy_and_assign.h"
 #include "lock.h"
-#include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
 #if defined(UNIT_TEST)
@@ -115,7 +115,7 @@ class Properties {
   static bool use_certificates_as_identification_;
   static bool provisioning_messages_are_binary_;
   static bool allow_service_certificate_requests_;
-  static scoped_ptr<CdmClientPropertySetMap> session_property_set_;
+  static std::unique_ptr<CdmClientPropertySetMap> session_property_set_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(Properties);
 };

libwvdrmengine/cdm/core/include/scoped_ptr.h

@@ -1,67 +0,0 @@
-// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
-// source code may only be used and distributed under the Widevine Master
-// License Agreement.
-//
-// A simple and partial implementation of scoped_ptr class.
-// The implementation is copied from gtest/include/gtest/internal/gtest-port.h.
-//
-#ifndef WVCDM_CORE_SCOPED_PTR_H_
-#define WVCDM_CORE_SCOPED_PTR_H_
-
-#include "disallow_copy_and_assign.h"
-
-namespace wvcdm {
-
-// A scoped_ptr<T> is like a T*, except that the destructor of scoped_ptr<T>
-// automatically deletes the pointer it holds (if any).
-// That is, scoped_ptr<T> owns the T object that it points to.
-// Like a T*, a scoped_ptr<T> may hold either NULL or a pointer to a T object.
-// Also like T*, scoped_ptr<T> is thread-compatible, and once you
-// dereference it, you get the thread safety guarantees of T.
-//
-// The size of scoped_ptr is small. On most compilers, sizeof(scoped_ptr<T>)
-// == sizeof(T*).
-//
-// Current implementation targets having a strict subset of  C++11's
-// unique_ptr<> features. Known deficiencies include not supporting move-only
-// deleteres, function pointers as deleters, and deleters with reference
-// types.
-
-// This implementation of scoped_ptr is PARTIAL, e.g. it does not support move,
-// custom deleter etc.
-template <typename T>
-class scoped_ptr {
- public:
-  typedef T element_type;
-
-  explicit scoped_ptr(T* p = NULL) : ptr_(p) {}
-  ~scoped_ptr() { reset(); }
-
-  T& operator*() const { return *ptr_; }
-  T* operator->() const { return ptr_; }
-  T* get() const { return ptr_; }
-
-  T* release() {
-    T* const ptr = ptr_;
-    ptr_ = NULL;
-    return ptr;
-  }
-
-  void reset(T* p = NULL) {
-    if (p != ptr_) {
-      if (sizeof(T) > 0) {  // Makes sure T is a complete type.
-        delete ptr_;
-      }
-      ptr_ = p;
-    }
-  }
-
- private:
-  T* ptr_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(scoped_ptr);
-};
-
-}  // namespace wvcdm
-
-#endif  // WVCDM_CORE_SCOPED_PTR_H_

libwvdrmengine/cdm/core/include/service_certificate.h

@@ -18,7 +18,6 @@
 #include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "privacy_crypto.h"
-#include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
 namespace wvcdm {
@@ -79,7 +78,7 @@ class ServiceCertificate {
   std::string provider_id_;
 
   // Public key.
-  scoped_ptr<RsaPublicKey> public_key_;
+  std::unique_ptr<RsaPublicKey> public_key_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(ServiceCertificate);
 };

libwvdrmengine/cdm/core/include/usage_table_header.h

@@ -5,6 +5,7 @@
 #ifndef WVCDM_CORE_USAGE_TABLE_HEADER_H_
 #define WVCDM_CORE_USAGE_TABLE_HEADER_H_
 
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -14,7 +15,6 @@
 #include "file_store.h"
 #include "lock.h"
 #include "metrics_collections.h"
-#include "scoped_ptr.h"
 #include "wv_cdm_types.h"
 
 namespace wvcdm {
@@ -100,8 +100,8 @@ class UsageTableHeader {
   // This handle and file system is only to be used when accessing
   // usage_table_header. Usage entries should use the file system provided
   // by CdmSession.
-  scoped_ptr<DeviceFiles> file_handle_;
-  scoped_ptr<FileSystem> file_system_;
+  std::unique_ptr<DeviceFiles> file_handle_;
+  std::unique_ptr<FileSystem> file_system_;
   CdmSecurityLevel security_level_;
   SecurityLevel requested_security_level_;
 
@@ -131,7 +131,7 @@ class UsageTableHeader {
   }
 
   // Test related data members
-  scoped_ptr<CryptoSession> test_crypto_session_;
+  std::unique_ptr<CryptoSession> test_crypto_session_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(UsageTableHeader);
 };