Address review comments

Merge from Widevine repo of http://go/wvgerrit/54540

Addressing comments in http://go/ag/4448747

Test: tested as part of http://go/ag/4674759
Change-Id: I29005397efcc2e982e635581cc68c8293cea6243

libwvdrmengine/cdm/core/include/cdm_session.h

@@ -10,8 +10,8 @@
 #include <vector>
 
 #include "crypto_session.h"
-#include "disallow_copy_and_assign.h"
 #include "device_files.h"
+#include "disallow_copy_and_assign.h"
 #include "file_store.h"
 #include "initialization_data.h"
 #include "license.h"

libwvdrmengine/cdm/core/include/content_key_session.h

@@ -2,8 +2,8 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 
-#ifndef WVCDM_CORE_CONTENT_KEY_SESSSION_H_
-#define WVCDM_CORE_CONTENT_KEY_SESSSION_H_
+#ifndef WVCDM_CORE_CONTENT_KEY_SESSION_H_
+#define WVCDM_CORE_CONTENT_KEY_SESSION_H_
 
 #include "key_session.h"
 #include "metrics_collections.h"
@@ -73,4 +73,4 @@ class ContentKeySession : public KeySession {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_CONTENT_KEY_SESSSION_H_
+#endif  // WVCDM_CORE_CONTENT_KEY_SESSION_H_

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -2,8 +2,8 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 
-#ifndef WVCDM_CORE_CRYPTO_SESSSION_H_
-#define WVCDM_CORE_CRYPTO_SESSSION_H_
+#ifndef WVCDM_CORE_CRYPTO_SESSION_H_
+#define WVCDM_CORE_CRYPTO_SESSION_H_
 
 #include <map>
 #include <string>
@@ -296,4 +296,4 @@ class CryptoSession {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_CRYPTO_SESSSION_H_
+#endif  // WVCDM_CORE_CRYPTO_SESSION_H_

libwvdrmengine/cdm/core/include/entitlement_key_session.h

@@ -2,8 +2,8 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 
-#ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_
-#define WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_
+#ifndef WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_
+#define WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_
 
 #include <map>
 #include <string>
@@ -50,4 +50,4 @@ class EntitlementKeySession : public ContentKeySession {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_ENTITLEMENT_KEY_SESSSION_H_
+#endif  // WVCDM_CORE_ENTITLEMENT_KEY_SESSION_H_

libwvdrmengine/cdm/core/include/key_session.h

@@ -2,8 +2,8 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 
-#ifndef WVCDM_CORE_KEY_SESSSION_H_
-#define WVCDM_CORE_KEY_SESSSION_H_
+#ifndef WVCDM_CORE_KEY_SESSION_H_
+#define WVCDM_CORE_KEY_SESSION_H_
 
 #include "metrics_collections.h"
 
@@ -47,4 +47,4 @@ typedef std::map<std::string, CryptoSessionId> SubLicenseSessionMap;
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_KEY_SESSSION_H_
+#endif  // WVCDM_CORE_KEY_SESSION_H_

libwvdrmengine/cdm/core/include/sublicense_key_session.h

@@ -1,5 +1,5 @@
-#ifndef WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_
-#define WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_
+#ifndef WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_
+#define WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_
 
 #include "crypto_key.h"
 #include "key_session.h"
@@ -92,4 +92,4 @@ class SubLicenseKeySession : public KeySession {
 
 }  // namespace wvcdm
 
-#endif  // WVCDM_CORE_SUBLICENSE_KEY_SESSSION_H_
+#endif  // WVCDM_CORE_SUBLICENSE_KEY_SESSION_H_

libwvdrmengine/cdm/util/include/clock.h

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // Clock - Platform independent interface for a time library
 //

libwvdrmengine/cdm/util/include/disallow_copy_and_assign.h

@@ -1,4 +1,6 @@
-// Copyright 2018 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 
 #ifndef WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_
 #define WVCDM_UTIL_DISALLOW_COPY_AND_ASSIGN_H_

libwvdrmengine/cdm/util/include/file_store.h

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // File - Platform independent interface for a File class
 //

libwvdrmengine/cdm/util/include/lock.h

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // Lock - Platform independent interface for a Mutex class
 //

libwvdrmengine/cdm/util/include/log.h

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 //
 // Log - Platform independent interface for a Logging class
 //

libwvdrmengine/cdm/util/include/string_conversions.h

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 
 #ifndef WVCDM_UTIL_STRING_CONVERSIONS_H_
 #define WVCDM_UTIL_STRING_CONVERSIONS_H_

libwvdrmengine/cdm/util/src/string_conversions.cpp

@@ -1,4 +1,6 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
+// Copyright 2018 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine Master
+// License Agreement.
 
 #include "string_conversions.h"