Revert "WvPL License SDK release: beta-16.4.6"

This reverts commit a4762f0315.

ubuntu/license_server_sdk/public/session.h

@@ -83,17 +83,11 @@ class Session {
       const std::string& service_private_key,
       const std::string& service_private_key_passphrase);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Enable delivery of licenses to client devices. This includes devices with
   // TEST_ONLY status, and development platform verification certificates.
   // Defaults to false.
   static void AllowDevelopmentClients(bool enable);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Enable delivery of licenses to TEST_ONLY client devices.
   // |device_list_make| is a comma separated list of devices to allow even
   // if the device is in a TEST_ONLY state.  This list wil be used only if
@@ -101,15 +95,8 @@ class Session {
   static void AllowTestOnlyDevices(const std::string& device_list_make) {
     AllowTestOnlyDevicesByMake(device_list_make);
   }
-
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   static void AllowTestOnlyDevicesByMake(const std::string& device_list_make);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Enable delivery of licenses to TEST_ONLY client devices.
   // |device_list_provider| is a comma separated list of provider to allow
   // even if the device is in a TEST_ONLY state.  This list wil be used only if
@@ -117,23 +104,14 @@ class Session {
   static void AllowTestOnlyDevicesByProvider(
       const std::string& device_list_provider);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Enable delivery of licenses to revoked client devices. |system_id_list| is
   // a comma separated list of systems Ids to allow even if revoked.
   static void AllowRevokedDevices(const std::string& system_id_list);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // A comma separated list of DRM Certificate Serial Numbers that are revoked.
   static void RevokedDrmCertificateSerialNumbers(
       const std::string& drm_certificate_serial_numbers);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Restriction on core message features. If this is an empty string, the
   // default feature set is used. If it is an integer, that is the ODK version
   // supported.
@@ -201,9 +179,6 @@ class Session {
       const SessionCreateOptions& options, Session** session,
       LicenseRequest* parsed_request_out);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Generates a SignedMessage containing a message generated in response to
   // an error condition. |status| is a previous error status returned by the
   // Session or Status(error::UNAVAILABLE, ...) to indicate that the
@@ -214,18 +189,12 @@ class Session {
   static bool GenerateErrorResponse(const Status& status,
                                     std::string* signed_message_bytes);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Generates a SignedMessage containing a service certificate for the
   // specified |provider_id|. This method returns true if a service certificate
   // exist for the provider.
   static bool GenerateServiceCertificateResponse(
       const std::string& provider_id, std::string* signed_message_bytes);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // DeriveKey uses the NIST 800-108 KDF recommendation, using AES-CMAC PRF.
   // NIST 800-108:
   // http://csrc.nist.gov/publications/nistpubs/800-108/sp800-108.pdf
@@ -235,23 +204,14 @@ class Session {
                                const std::string& context,
                                const uint32_t size_bits);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Returns a std::string containing the Widevine License Server SDK version in the
   // form <major_version>.<minor_version>.<release> <build date> <build time> .
   static std::string GetSdkVersionString();
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // If set to true, adds SDK and server version information to the license
   // response.
   static void SetIncludeVersionInfoInLicense(bool include_version_info);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Sets the service version information which can be included with the license
   // response. If SetIncludeVersionInfoInLicense() is set to true and the server
   // version is not empty, then the server version will be included in the
@@ -259,17 +219,11 @@ class Session {
   // alphanumeric and '_', '-', ':', ';', ' ', '/' and '.'.
   static void SetHostServerVersion(const std::string& host_version);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Generate a signed request to be sent to Widevine Certificate Provisioning
   // Server to retrieve 'DeviceCertificateStatusList'.
   static Status GenerateDeviceStatusListRequest(
       std::string* signed_device_certificate_status_list_request);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Set the custom device security profile list which is returned, from a call
   // to Widevine PublishedDevicesService.
   static Status SetCustomDeviceSecurityProfiles(
@@ -388,32 +342,20 @@ class Session {
   // 'Provider' making the request.
   virtual void set_provider(const std::string& provider);
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Obtain the owner list for custom profiles.
   virtual Status GetCustomDeviceSecurityProfileOwners(
       std::vector<std::string>* custom_profile_owners) const;
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Return a list of custom profile names associated with |owner_name|.
   virtual Status GetCustomDeviceSecurityProfileNames(
       absl::string_view owner_name,
       std::vector<std::string>* profile_names) const;
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Return the custom profiles associated with |owner_name|.
   virtual Status GetCustomDeviceSecurityProfiles(
       absl::string_view owner_name,
       std::vector<SecurityProfile>* custom_device_security_profiles) const;
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Return a list of default profile names obtained from default profiles.
   // The input argument |profile_names| cannot be null and it will be replaced
   // by the results.
@@ -421,9 +363,6 @@ class Session {
   virtual Status GetDefaultDeviceSecurityProfileNames(
       std::vector<std::string>* profile_names) const;
 
-  // Deprecated.
-  // TODO(b/187189998): This API is now available in environment.h. It will be
-  // removed from this header file in the mid-Q3 2021 SDK release.
   // Return the default profile associated with |profile_name|.
   virtual Status GetDefaultDeviceSecurityProfile(
       absl::string_view profile_name,
@@ -449,16 +388,9 @@ class Session {
   virtual LicenseRequest::RequestType request_type() const;
 
  protected:
-  Session(std::unique_ptr<SessionImpl> impl,
-          SecurityProfileList* security_profile_list);
-  Session(std::unique_ptr<ExternalPlayReadySessionImpl>
-              external_playready_session_impl,
-          SecurityProfileList* security_profile_list);
   // For testing only. This allows unit tests to define a mock Session class.
   Session();
 
-  friend class EnvironmentImpl;
-
  private:
 #ifndef SWIG
   Session(const Session&) = delete;