Merge Tweaks Originating in Merge Review Comments

This merges several small changes that were made in response to
comments that arose when LMP changes were merged into the Widevine
repository's master branch.

Change-Id: Ifec968af54dbc3288f24654ec0c6ca9b5962e1aa

libwvdrmengine/cdm/core/include/cdm_engine.h

@@ -142,7 +142,7 @@ class CdmEngine {
 
   // We assume that the WvCdmEventListener is asynchronous -- i.e. an event
   // should be dispatched to another thread which actually does the work. In
-  // particular, if a syncrhonous listener calls OpenSession or CloseSession,
+  // particular, if a synchronous listener calls OpenSession or CloseSession,
   // the thread will dead lock.
   // Returns false if listener already attached.
   virtual bool AttachEventListener(const CdmSessionId& session_id,

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -134,7 +134,7 @@ class CdmSession {
 
   // decryption and usage flags
   bool is_initial_decryption_;
-  bool has_decrypted_recently_;
+  bool has_decrypted_since_last_report_;  // ... last report to policy engine.
   bool is_initial_usage_update_;
   bool is_usage_update_needed_;
 

libwvdrmengine/cdm/core/include/initialization_data.h

@@ -13,7 +13,7 @@ class WvCdmEngineTest;
 
 class InitializationData {
  public:
-  InitializationData(const std::string& type,
+  InitializationData(const std::string& type = std::string(),
                      const CdmInitData& data = CdmInitData());
 
   bool is_supported() const { return is_cenc_ || is_webm_; }

libwvdrmengine/cdm/core/include/max_res_engine.h

@@ -74,11 +74,12 @@ class MaxResEngine {
 
     bool can_decrypt_;
 
-    scoped_ptr<CryptoSession::OemCryptoHdcpVersion> default_hdcp_level_;
+    CryptoSession::OemCryptoHdcpVersion default_hdcp_level_;
     ConstraintList constraints_;
   };
 
-  typedef std::map<wvcdm::KeyId, KeyStatus*>::const_iterator KeyIterator;
+  typedef std::map<wvcdm::KeyId,
+                   wvcdm::MaxResEngine::KeyStatus*>::const_iterator KeyIterator;
 
   void Init(CryptoSession* crypto_session, Clock* clock);
 

libwvdrmengine/cdm/core/include/string_conversions.h

@@ -22,7 +22,7 @@ std::string HexEncode(const uint8_t* bytes, unsigned size);
 std::string IntToString(int value);
 std::string UintToString(unsigned int value);
 int64_t htonll64(int64_t x);
-int64_t ntohll64(int64_t x);
+inline int64_t ntohll64(int64_t x) { return htonll64(x); }
 
 }  // namespace wvcdm