Google-style override & virtual

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

Google C++ Style dictates that methods which override base class or
interface methods should be declared "override" but not "virtual". Since
our codebase has not had access to "override" until now, many of our
classes do not follow this rule. I've updated as many places as I could
find to follow Google C++ Style, which should hopefully help us catch
errors better in the future.

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

libwvdrmengine/cdm/core/test/cdm_engine_test.cpp

@@ -48,9 +48,9 @@ class WvCdmEnginePreProvTest : public WvCdmTestBase {
   WvCdmEnginePreProvTest()
       : cdm_engine_(&file_system_), session_opened_(false) {}
 
-  virtual ~WvCdmEnginePreProvTest() {}
+  ~WvCdmEnginePreProvTest() override {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     session_opened_ = false;
   }
@@ -69,7 +69,7 @@ class WvCdmEnginePreProvTest : public WvCdmTestBase {
     session_opened_ = true;
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     if (cdm_engine_.IsProvisioned(kSecurityLevelL1)) {
       cdm_engine_.Unprovision(kSecurityLevelL1);
     }
@@ -150,7 +150,7 @@ class WvCdmEngineTest : public WvCdmEnginePreProvTest {
  public:
   WvCdmEngineTest() {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     session_opened_ = false;
     WvCdmEnginePreProvTest::OpenSession();

libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp

@@ -172,7 +172,7 @@ class MockCdmLicense : public CdmLicense {
 
 class CdmSessionTest : public WvCdmTestBase {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     cdm_session_.reset(new CdmSession(NULL, &metrics_));
     // Inject testing mocks.
@@ -186,7 +186,7 @@ class CdmSessionTest : public WvCdmTestBase {
     cdm_session_->set_file_handle(file_handle_);
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     // Force the cdm_session_ to be deleted. This enforces a requirement that
     // the CDM session metrics exist at least as long as the CDM session.
     cdm_session_.reset();

libwvdrmengine/cdm/core/test/device_files_unittest.cpp

@@ -2006,7 +2006,7 @@ using ::testing::StrEq;
 
 class DeviceFilesTest : public ::testing::Test {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     ASSERT_TRUE(Properties::GetDeviceFilesBasePath(kSecurityLevelL1,
                                                    &device_base_path_));
   }

libwvdrmengine/cdm/core/test/file_store_unittest.cpp

@@ -24,7 +24,7 @@ class FileTest : public testing::Test {
  protected:
   FileTest() {}
 
-  virtual void TearDown() { RemoveTestDir(); }
+  void TearDown() override { RemoveTestDir(); }
 
   void RemoveTestDir() {
     EXPECT_TRUE(file_system.Remove(test_vectors::kTestDir));

libwvdrmengine/cdm/core/test/generic_crypto_unittest.cpp

@@ -34,7 +34,7 @@ class WvGenericOperationsTest : public WvCdmTestBase {
   WvGenericOperationsTest()
       : cdm_engine_(&file_system_), holder_(&cdm_engine_) {}
 
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     EnsureProvisioned();
     holder_.OpenSession(config_.key_system());
@@ -61,7 +61,7 @@ class WvGenericOperationsTest : public WvCdmTestBase {
     iv_ = std::string(iv_vector_.begin(), iv_vector_.end());
   }
 
-  virtual void TearDown() { holder_.CloseSession(); }
+  void TearDown() override { holder_.CloseSession(); }
 
   // Create a single key, and add it to the license.
   void AddOneKey(const KeyId& key_id, const std::vector<uint8_t>& key_data,

libwvdrmengine/cdm/core/test/license_keys_unittest.cpp

@@ -97,7 +97,7 @@ class LicenseKeysTest : public ::testing::Test {
   static const KeyFlag kContentClearFalse = kKeyFlagFalse;
   static const KeyFlag kContentClearTrue = kKeyFlagTrue;
 
-  virtual void SetUp() {
+  void SetUp() override {
     LicenseIdentification* id = license_.mutable_id();
     id->set_version(1);
     id->set_type(STREAMING);

libwvdrmengine/cdm/core/test/license_unittest.cpp

@@ -207,7 +207,7 @@ class CdmLicenseTest : public WvCdmTestBase {
  protected:
   CdmLicenseTest(const std::string& pssh = (kCencInitDataHdr + kCencPssh))
       : pssh_(pssh) {}
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     clock_ = new MockClock();
     crypto_session_ = new MockCryptoSession(&crypto_metrics_);
@@ -219,7 +219,7 @@ class CdmLicenseTest : public WvCdmTestBase {
             DoAll(SetArgPointee<0>(kDefaultSupportedCertTypes), Return(true)));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     if (cdm_license_) delete cdm_license_;
     if (policy_engine_) delete policy_engine_;
     if (init_data_) delete init_data_;

libwvdrmengine/cdm/core/test/policy_engine_constraints_unittest.cpp

@@ -92,7 +92,7 @@ class PolicyEngineConstraintsTest : public WvCdmTestBase {
   }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     current_time_ = 0;
 

libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp

@@ -105,7 +105,7 @@ class PolicyEngineTest : public WvCdmTestBase {
   PolicyEngineTest() : crypto_session_(&dummy_metrics_) {
   }
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     policy_engine_.reset(
         new PolicyEngine(kSessionId, &mock_event_listener_,
@@ -1927,7 +1927,7 @@ TEST_F(PolicyEngineKeyAllowedUsageTest, AllowedUsageGeneric) {
 
 class PolicyEngineQueryTest : public PolicyEngineTest {
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     PolicyEngineTest::SetUp();
     policy_engine_.reset(new PolicyEngine(kSessionId, NULL, &crypto_session_));
     InjectMockClock();

libwvdrmengine/cdm/core/test/service_certificate_unittest.cpp

@@ -57,27 +57,27 @@ class StubCdmClientPropertySet : public CdmClientPropertySet {
         session_sharing_id_(0),
         app_id_(kAppId) {}
 
-  virtual const std::string& security_level() const { return security_level_; }
+  const std::string& security_level() const override { return security_level_; }
 
-  virtual bool use_privacy_mode() const { return use_privacy_mode_; }
+  bool use_privacy_mode() const override { return use_privacy_mode_; }
 
-  virtual const std::string& service_certificate() const {
+  const std::string& service_certificate() const override {
     return raw_service_certificate_;
   }
 
-  virtual void set_service_certificate(const std::string& cert) {
+  void set_service_certificate(const std::string& cert) override {
     raw_service_certificate_ = cert;
   }
 
-  virtual bool is_session_sharing_enabled() const {
+  bool is_session_sharing_enabled() const override {
     return is_session_sharing_enabled_;
   }
 
-  virtual uint32_t session_sharing_id() const { return session_sharing_id_; }
+  uint32_t session_sharing_id() const override { return session_sharing_id_; }
 
-  virtual void set_session_sharing_id(uint32_t id) { session_sharing_id_ = id; }
+  void set_session_sharing_id(uint32_t id) override { session_sharing_id_ = id; }
 
-  virtual const std::string& app_id() const { return app_id_; }
+  const std::string& app_id() const override { return app_id_; }
 
   void enable_privacy_mode() { use_privacy_mode_ = true; }
 

libwvdrmengine/cdm/core/test/test_base.h

@@ -20,8 +20,8 @@ namespace wvcdm {
 class WvCdmTestBase : public ::testing::Test {
  public:
   WvCdmTestBase() : config_(default_config_), binary_provisioning_(false) {}
-  virtual ~WvCdmTestBase() {}
-  virtual void SetUp();
+  ~WvCdmTestBase() override {}
+  void SetUp() override;
   virtual std::string binary_key_id() const { return a2bs_hex(config_.key_id()); }
 
   // Returns true if the test program should continue, if false, the caller

libwvdrmengine/cdm/core/test/usage_table_header_unittest.cpp

@@ -264,7 +264,7 @@ class UsageTableHeaderTest : public WvCdmTestBase {
   }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     WvCdmTestBase::SetUp();
     // UsageTableHeader will take ownership of the pointer
     device_files_ = new MockDeviceFiles();
@@ -276,7 +276,7 @@ class UsageTableHeaderTest : public WvCdmTestBase {
     usage_table_header_->SetCryptoSession(crypto_session_);
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     if (usage_table_header_ != NULL) delete usage_table_header_;
   }