Fix or ignore compiler warnings

Merge from Widevine repo of http://go/wvgerrit/24688

b/35466719

Change-Id: If89f0cad0c61f37536a84f8dadaf08072356343a

libwvdrmengine/oemcrypto/test/oec_session_util.h

@@ -248,7 +248,6 @@ class Session {
   // Calls OEMCrypto_RewrapDeviceRSAKey30 with the given provisioning response
   // message. If force is true, we assert that the key loads successfully.
   void RewrapRSAKey30(const struct RSAPrivateKeyMessage& encrypted,
-                      size_t message_size,
                       const std::vector<uint8_t>& encrypted_message_key,
                       vector<uint8_t>* wrapped_key, bool force);
   // Loads the specified wrapped_rsa_key into OEMCrypto, and then runs
@@ -269,8 +268,7 @@ class Session {
   // Update the usage entry and save the header to the specified buffer.
   void UpdateUsageEntry(std::vector<uint8_t>* header_buffer);
   // Deactivate this session's usage entry.
-  void DeactivateUsageEntry(const std::string& pst,
-                            OEMCryptoResult expect_result = OEMCrypto_SUCCESS);
+  void DeactivateUsageEntry(const std::string& pst);
   // The usage entry number for this session's usage entry.
   uint32_t usage_entry_number() const { return usage_entry_number_; }
   void set_usage_entry_number(uint32_t v) { usage_entry_number_ = v; }
@@ -330,7 +328,7 @@ class Session {
   void set_num_keys(int num_keys) { num_keys_ = num_keys; }
   // The current number of keys to use in the license(), encrypted_license()
   // and key_array().
-  int num_keys() const { return num_keys_; }
+  unsigned int num_keys() const { return num_keys_; }
 
   // Set the size of the buffer used the encrypted license.
   // Must be between sizeof(MessageData) and kMaxMessageSize.
@@ -355,7 +353,7 @@ class Session {
   size_t message_size_;  // How much of the padded message to use.
   OEMCrypto_KeyObject key_array_[kMaxNumKeys];
   std::vector<uint8_t> signature_;
-  int num_keys_;
+  unsigned int num_keys_;
   vector<uint8_t> encrypted_usage_entry_;
   uint32_t usage_entry_number_;
   string pst_;