Source release 14.1.0

core/include/certificate_provisioning.h

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// 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.
 
 #ifndef WVCDM_CORE_CERTIFICATE_PROVISIONING_H_
 #define WVCDM_CORE_CERTIFICATE_PROVISIONING_H_
@@ -6,6 +8,7 @@
 #include <string>
 
 #include "crypto_session.h"
+#include "disallow_copy_and_assign.h"
 #include "license_protocol.pb.h"
 #include "metrics_collections.h"
 #include "oemcrypto_adapter.h"
@@ -44,10 +47,6 @@ class CertificateProvisioning {
       std::string* cert, std::string* wrapped_key);
 
  private:
-  // TODO(b/36897239): Remove this once it is no longer needed.
-  bool GetProvisioningTokenType(
-      video_widevine::ClientIdentification::TokenType* token_type);
-
   bool SetSpoidParameter(const std::string& origin, const std::string& spoid,
                          video_widevine::ProvisioningRequest* request);