Source release 16.4.0

core/test/cdm_session_unittest.cpp

@@ -9,7 +9,6 @@
 
 #include "cdm_session.h"
 #include "crypto_key.h"
-#include "metrics.pb.h"
 #include "properties.h"
 #include "service_certificate.h"
 #include "string_conversions.h"
@@ -17,6 +16,7 @@
 #include "test_printers.h"
 #include "usage_table_header.h"
 #include "wv_cdm_constants.h"
+#include "wv_metrics.pb.h"
 
 using ::testing::_;
 using ::testing::DoAll;