Updated copyright notice and cleaned up includes.

[ Merge of http://go/wvgerrit/137810 ]

Bug: 204946540
Test: Metric unit tests
Change-Id: I78f839fafd27604a2bb78c04d587c40919c5372d

libwvdrmengine/cdm/metrics/include/event_metric.h

@@ -1,26 +1,24 @@
-// Copyright 2017 Google Inc. All Rights Reserved.
+// Copyright 2017 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 //
 // This file contains the declarations for the EventMetric class and related
 // types.
 #ifndef WVCDM_METRICS_EVENT_METRIC_H_
 #define WVCDM_METRICS_EVENT_METRIC_H_
-
-#include <cstdarg>
 #include <map>
 #include <mutex>
 #include <string>
-#include <vector>
 
-#include "OEMCryptoCENC.h"
 #include "attribute_handler.h"
 #include "distribution.h"
+#include "field_tuples.h"
 #include "log.h"
 #include "pow2bucket.h"
 #include "wv_metrics.pb.h"
 
 namespace wvcdm {
 namespace metrics {
-
 class EventMetricTest;
 
 // This base class provides the common defintion used by all templated
@@ -166,8 +164,6 @@ inline void EventMetric<I1, F1, I2, F2, I3, F3, I4, F4>::ToProto(
     SetDistributionValues(*it->second, new_metric);
   }
 }
-
 }  // namespace metrics
 }  // namespace wvcdm
-
 #endif  // WVCDM_METRICS_EVENT_METRIC_H_