Should not expose proto headers in public SDK headers and not include absl

mutex.h in public SDK headers.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=249330673
This commit is contained in:
Widevine Buildbot
2019-05-21 22:05:33 +00:00
parent dda00601c2
commit 4accf94610
5 changed files with 1 additions and 7 deletions

Binary file not shown.

View File

@@ -13,7 +13,6 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "absl/synchronization/mutex.h"
#include "sdk/external/common/wvpl/wvpl_sdk_session.h" #include "sdk/external/common/wvpl/wvpl_sdk_session.h"
namespace widevine { namespace widevine {
@@ -107,9 +106,6 @@ class WvPLCASProxySession : public WvPLSDKSession {
// holds all the WvPLCasKey objects. Used when generating a CAS License. // holds all the WvPLCasKey objects. Used when generating a CAS License.
std::vector<WvPLCasKey> cas_keys_; std::vector<WvPLCasKey> cas_keys_;
// Mutex to protect the keys, |cas_keys_|, owned by this session.
mutable std::unique_ptr<absl::Mutex> cas_keys_mutex_;
}; };
} // namespace wv_pl_sdk } // namespace wv_pl_sdk

View File

@@ -13,7 +13,6 @@
#include <string> #include <string>
#include "sdk/external/common/wvpl/wvpl_types.h" #include "sdk/external/common/wvpl/wvpl_types.h"
#include "protos/public/drm_certificate.pb.h"
namespace widevine { namespace widevine {
class DeviceCertificateStatusList; class DeviceCertificateStatusList;
@@ -111,8 +110,7 @@ class WvPLSDKEnvironment {
private: private:
// Get the expected service type for drm service certificate. // Get the expected service type for drm service certificate.
virtual widevine::DrmCertificate::ServiceType virtual int GetExpectedServiceCertificateType();
GetExpectedServiceCertificateType();
// Check the type of |service_certificate|. Returns "OK" if the cert can be // Check the type of |service_certificate|. Returns "OK" if the cert can be
// used for the current SDK, else an error status. // used for the current SDK, else an error status.