Source release 19.3.0

core/include/service_certificate.h

@@ -1,10 +1,21 @@
 // Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
 // source code may only be used and distributed under the Widevine License
 // Agreement.
-//
 #ifndef WVCDM_CORE_SERVICE_CERTIFICATE_H_
 #define WVCDM_CORE_SERVICE_CERTIFICATE_H_
 
+#include <memory>
+#include <string>
+
+#include "license_protocol.pb.h"
+#include "privacy_crypto.h"
+#include "wv_cdm_types.h"
+#include "wv_class_utils.h"
+
+namespace wvcdm {
+
+class CryptoSession;
+
 // Service Certificates are used to encrypt the ClientIdentification message
 // that is part of Device Provisioning, License, Renewal, and Release requests.
 // It also supplies a provider_id setting used in device provisioning.
@@ -12,21 +23,10 @@
 // is not supplied and privacy mode is enabled, the CDM will send a Service
 // Certificate Request to the target server to get one. Once the Service
 // Certificate is established for the session, it should not change.
-
-#include <memory>
-
-#include "disallow_copy_and_assign.h"
-#include "license_protocol.pb.h"
-#include "privacy_crypto.h"
-#include "wv_cdm_types.h"
-
-namespace wvcdm {
-
-class CryptoSession;
-
 class ServiceCertificate {
  public:
   ServiceCertificate() : has_certificate_(false) {}
+  WVCDM_DISALLOW_COPY_AND_MOVE(ServiceCertificate);
   virtual ~ServiceCertificate() {}
 
   // Set up a new service certificate.
@@ -79,10 +79,6 @@ class ServiceCertificate {
 
   // Public key.
   std::unique_ptr<RsaPublicKey> public_key_;
-
-  CORE_DISALLOW_COPY_AND_ASSIGN(ServiceCertificate);
-};
-
+};  // class ServiceCertificate
 }  // namespace wvcdm
-
 #endif  // WVCDM_CORE_SERVICE_CERTIFICATE_H_