Merge "Resolving Compiler Warnings"

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -198,6 +198,9 @@ class CryptoSession {
   static bool initialized_;
   static int session_count_;
 
+  metrics::MetricsGroup* metrics_;
+  metrics::TimerMetric life_span_;
+
   bool open_;
   CdmClientTokenType pre_provision_token_type_;
   bool update_usage_table_after_close_session_;
@@ -212,9 +215,6 @@ class CryptoSession {
   uint64_t request_id_base_;
   static uint64_t request_id_index_;
 
-  metrics::MetricsGroup* metrics_;
-  metrics::TimerMetric life_span_;
-
   CdmCipherMode cipher_mode_;
 
   CORE_DISALLOW_COPY_AND_ASSIGN(CryptoSession);

libwvdrmengine/cdm/core/src/cdm_session.cpp

@@ -26,6 +26,7 @@ namespace wvcdm {
 
 CdmSession::CdmSession(FileSystem* file_system) :
     initialized_(false),
+    crypto_session_(new CryptoSession(&metrics_)),
     file_handle_(new DeviceFiles(file_system)),
     license_received_(false),
     is_offline_(false),
@@ -38,8 +39,7 @@ CdmSession::CdmSession(FileSystem* file_system) :
     is_initial_usage_update_(true),
     is_usage_update_needed_(false),
     mock_license_parser_in_use_(false),
-    mock_policy_engine_in_use_(false),
-    crypto_session_(new CryptoSession(&metrics_)) {
+    mock_policy_engine_in_use_(false) {
   life_span_.Start();
 }