Merge changes I37d6d7aa,I9e8624dd,I96c2015a,I0b755962

* changes:
  Replace scoped_ptr With std::unique_ptr
  Replace shared_ptr With std::shared_ptr
  Replace UniquePtr with std::unique_ptr
  override, Don't OVERRIDE

libwvdrmengine/cdm/core/test/cdm_engine_test.cpp

@@ -21,7 +21,6 @@
 #include "metrics.pb.h"
 #include "OEMCryptoCENC.h"
 #include "properties.h"
-#include "scoped_ptr.h"
 #include "string_conversions.h"
 #include "test_base.h"
 #include "test_printers.h"

libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp

@@ -2,13 +2,15 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 
+#include <memory>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
+
 #include "cdm_session.h"
 #include "crypto_key.h"
 #include "metrics.pb.h"
 #include "properties.h"
-#include "scoped_ptr.h"
 #include "service_certificate.h"
 #include "string_conversions.h"
 #include "test_base.h"
@@ -191,7 +193,7 @@ class CdmSessionTest : public WvCdmTestBase {
   }
 
   metrics::SessionMetrics metrics_;
-  scoped_ptr<CdmSession> cdm_session_;
+  std::unique_ptr<CdmSession> cdm_session_;
   MockCdmLicense* license_parser_;
   metrics::CryptoMetrics crypto_metrics_;
   NiceMock<MockCryptoSession>* crypto_session_;

libwvdrmengine/cdm/core/test/crypto_session_unittest.cpp

@@ -3,6 +3,7 @@
 // License Agreement.
 
 #include <arpa/inet.h>
+#include <memory>
 #include <string>
 
 #include <gtest/gtest.h>
@@ -14,7 +15,6 @@
 #include "log.h"
 #include "metrics.pb.h"
 #include "metrics_collections.h"
-#include "scoped_ptr.h"
 #include "test_base.h"
 #include "test_printers.h"
 #include "wv_cdm_types.h"
@@ -282,7 +282,7 @@ class CryptoSessionMetricsTest : public WvCdmTestBase {
 
 TEST_F(CryptoSessionMetricsTest, OpenSessionValidMetrics) {
   metrics::CryptoMetrics crypto_metrics;
-  scoped_ptr<CryptoSession> session(
+  std::unique_ptr<CryptoSession> session(
       CryptoSession::MakeCryptoSession(&crypto_metrics));
   session->Open(wvcdm::kLevelDefault);
   // Exercise a method that will touch a metric.
@@ -340,7 +340,7 @@ TEST_F(CryptoSessionMetricsTest, OpenSessionValidMetrics) {
 
 TEST_F(CryptoSessionMetricsTest, GetProvisioningTokenValidMetrics) {
   metrics::CryptoMetrics crypto_metrics;
-  scoped_ptr<CryptoSession> session(
+  std::unique_ptr<CryptoSession> session(
       CryptoSession::MakeCryptoSession(&crypto_metrics));
 
   ASSERT_EQ(NO_ERROR, session->Open(wvcdm::kLevelDefault));

libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp

@@ -20,7 +20,6 @@
 #include "oemcrypto_session_tests_helper.h"
 #include "oemcrypto_types.h"
 #include "properties.h"
-#include "scoped_ptr.h"
 #include "string_conversions.h"
 #include "test_base.h"
 #include "test_printers.h"

libwvdrmengine/cdm/core/test/http_socket_test.cpp

@@ -3,10 +3,12 @@
 // License Agreement.
 
 #include <errno.h>
+#include <memory>
+
 #include <gtest/gtest.h>
+
 #include "http_socket.h"
 #include "log.h"
-#include "scoped_ptr.h"
 #include "string_conversions.h"
 #include "url_request.h"
 
@@ -90,7 +92,7 @@ class HttpSocketTest : public testing::Test {
     return true;
   }
 
-  scoped_ptr<HttpSocket> socket_;
+  std::unique_ptr<HttpSocket> socket_;
   std::string domain_name_;
   std::string resource_path_;
 };

libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp

@@ -2,6 +2,8 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 
+#include <memory>
+
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -10,7 +12,6 @@
 #include "metrics_collections.h"
 #include "policy_engine.h"
 #include "mock_clock.h"
-#include "scoped_ptr.h"
 #include "test_base.h"
 #include "test_printers.h"
 #include "wv_cdm_event_listener.h"
@@ -215,7 +216,7 @@ class PolicyEngineConstraintsTest : public WvCdmTestBase {
                     expected_has_new_usable_key));
   }
 
-  scoped_ptr<PolicyEngine> policy_engine_;
+  std::unique_ptr<PolicyEngine> policy_engine_;
   MockClock* mock_clock_;
   int64_t current_time_;
   metrics::CryptoMetrics dummy_metrics_;

libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp

@@ -5,6 +5,7 @@
 #include <limits.h>
 
 #include <algorithm>
+#include <memory>
 #include <sstream>
 
 #include <gmock/gmock.h>
@@ -13,7 +14,6 @@
 #include "license.h"
 #include "mock_clock.h"
 #include "policy_engine.h"
-#include "scoped_ptr.h"
 #include "test_base.h"
 #include "test_printers.h"
 #include "wv_cdm_event_listener.h"
@@ -185,7 +185,7 @@ class PolicyEngineTest : public WvCdmTestBase {
   NiceMock<HdcpOnlyMockCryptoSession> crypto_session_;
   StrictMock<MockCdmEventListener> mock_event_listener_;
   MockClock* mock_clock_;
-  scoped_ptr<PolicyEngine> policy_engine_;
+  std::unique_ptr<PolicyEngine> policy_engine_;
   License license_;
   MockFunction<void(int i)> check_;
 };

libwvdrmengine/cdm/core/test/shared_ptr_test.cpp

@@ -1,130 +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.
-
-#include <string>
-#include <errno.h>
-#include <getopt.h>
-#include <gtest/gtest.h>
-
-#include "shared_ptr.h"
-
-#include "log.h"
-
-namespace wvcdm {
-
-class SharedPtrTest : public testing::Test {
- public:
-
-  static void NoteDeletion() {
-    deletions++;
-  }
-
-  class Dummy {
-   public:
-    explicit Dummy(int v) : value_(v) { exists_ = true; }
-    ~Dummy() {
-      NoteDeletion();
-      exists_ = false;
-    }
-    bool exists() { return exists_; }
-    int getValue() { return value_; }
-    void setValue(int v) { value_ = v; }
-   private:
-    bool exists_;
-    int value_;
-  };
-
-  static void ExpectedDeletions(int count) {
-    ASSERT_TRUE(deletions == count);
-    deletions = 0;
-  }
-
-  virtual void SetUpTest() {
-    deletions = 0;
-  }
-  virtual void TearDownTest() {
-    deletions = 0;
-  }
- private:
-  static int deletions;
-};
-
-int SharedPtrTest::deletions = 0;
-
-TEST_F(SharedPtrTest, NullSingletonCreate) {
-  shared_ptr<Dummy> sd1;
-  ASSERT_TRUE(sd1.unique());
-  ASSERT_TRUE(sd1.get() == NULL);
-  ExpectedDeletions(0);
-}
-
-TEST_F(SharedPtrTest, SingletonCreate) {
-  {
-    Dummy* d1 = new Dummy(42);
-    shared_ptr<Dummy> sd1(d1);
-    ASSERT_TRUE(sd1.unique());
-    ASSERT_TRUE(sd1.get() == d1);
-    ASSERT_TRUE(sd1->getValue() == 42);
-  }
-  ExpectedDeletions(1);
-}
-
-TEST_F(SharedPtrTest, ResetToNull) {
-  Dummy* d1 = new Dummy(42);
-  shared_ptr<Dummy> sd1(d1);
-  ASSERT_TRUE(sd1->getValue() == 42);
-  sd1.reset();
-  ExpectedDeletions(1);
-  ASSERT_TRUE(sd1.get() == NULL);
-}
-
-TEST_F(SharedPtrTest, SharedCreate) {
-  {
-    Dummy* d1 = new Dummy(42);
-    shared_ptr<Dummy> sd1(d1);
-    {
-      shared_ptr<Dummy> sd2(sd1);
-      ASSERT_FALSE(sd1.unique());
-      ASSERT_TRUE(sd1.get() == d1);
-      ASSERT_TRUE(sd2.get() == d1);
-      ASSERT_TRUE(sd1.use_count() == 2);
-    }
-    ExpectedDeletions(0);
-    ASSERT_TRUE(sd1.use_count() == 1);
-  }
-  ExpectedDeletions(1);
-}
-
-TEST_F(SharedPtrTest, SharedInstance) {
-  Dummy* d1 = new Dummy(42);
-  {
-    shared_ptr<Dummy> sd1(d1);
-    {
-      shared_ptr<Dummy> sd2(sd1);
-      ASSERT_FALSE(sd1.unique());
-      ASSERT_TRUE(sd1.get() == d1);
-      ASSERT_TRUE(sd2.get() == d1);
-      sd2->setValue(55);
-      ASSERT_TRUE(sd1.use_count() == 2);
-    }
-    ExpectedDeletions(0);
-    ASSERT_TRUE(sd1.use_count() == 1);
-    ASSERT_TRUE(sd1->getValue() == 55);
-  }
-  ExpectedDeletions(1);
-}
-
-TEST_F(SharedPtrTest, Reset) {
-  {
-    Dummy* d1 = new Dummy(42);
-    Dummy* d2 = new Dummy(96);
-    shared_ptr<Dummy> sd1(d1);
-    sd1.reset(d2);
-    ExpectedDeletions(1);
-    ASSERT_TRUE(sd1->getValue() == 96);
-  }
-  ExpectedDeletions(1);
-}
-
-}  // namespace wvcdm