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/src/metrics_collections.cpp

@@ -1,5 +1,6 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
-
+// Copyright 2016 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
 #include "metrics_collections.h"
 
 #include <algorithm>
@@ -7,13 +8,13 @@
 #include "log.h"
 #include "wv_metrics.pb.h"
 
+namespace wvcdm {
+namespace metrics {
 using ::drm_metrics::Attributes;
 using ::drm_metrics::WvCdmMetrics;
 using ::google::protobuf::RepeatedPtrField;
 using ::wvcdm::metrics::EventMetric;
-
 namespace {
-
 // Helper struct for comparing session ids.
 struct CompareSessionIds {
   const std::string& target_;
@@ -25,11 +26,7 @@ struct CompareSessionIds {
     return metrics->GetSessionId() == target_;
   }
 };
-
-}  // anonymous namespace
-
-namespace wvcdm {
-namespace metrics {
+}  // namespace
 
 void CryptoMetrics::Serialize(
     WvCdmMetrics::CryptoMetrics* crypto_metrics) const {
@@ -458,6 +455,5 @@ void EngineMetrics::SerializeEngineMetrics(
 
   crypto_metrics_.Serialize(engine_metrics->mutable_crypto_metrics());
 }
-
 }  // namespace metrics
 }  // namespace wvcdm