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"
 

libwvdrmengine/oemcrypto/ref/README.md

@@ -1,5 +1,5 @@
 # Reference OEMCrypto
 
 This directory contains a testing-only implementation of OEMCrypto. **This
-implementation is *NOT* suitable for production use and should *NOT* be released
+implementation is *NOT* suitable for production use and must *NOT* be released
 on devices.**

libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_auth_ref.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_auth_ref.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef OEMCRYPTO_AUTH_REF_H_
 #define OEMCRYPTO_AUTH_REF_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 
 #include "oemcrypto_engine_ref.h"

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_L1.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 //  This file contains oemcrypto engine properties that would be for a
 //  level 1 device.

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_cert.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 //  This file contains oemcrypto engine properties that would be for a device
 //  that does not have persistant storage or a keybox.

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_device_properties_prov30.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 //  This file contains oemcrypto engine properties that would be for a
 //  level 2 device that does not have persistant storage or a keybox.

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_engine_ref.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_engine_ref.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef REF_OEMCRYPTO_ENGINE_REF_H_
 #define REF_OEMCRYPTO_ENGINE_REF_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_key_ref.h"
 #include "oemcrypto_types.h"

libwvdrmengine/oemcrypto/ref/src/oemcrypto_key_ref.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef OEMCRYPTO_KEY_REF_H_
 #define OEMCRYPTO_KEY_REF_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_keybox_ref.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_keybox_ref.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef OEMCRYPTO_KEYBOX_REF_H_
 #define OEMCRYPTO_KEYBOX_REF_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_nonce_table.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_nonce_table.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef REF_OEMCRYPTO_NONCE_TABLE_H_
 #define REF_OEMCRYPTO_NONCE_TABLE_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 // This is from the v12 version of oemcrypto usage tables.  It is used for
 // devices that upgrade from v12 to v13 in the field, and need to convert from

libwvdrmengine/oemcrypto/ref/src/oemcrypto_old_usage_table_ref.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 // This is from the v12 version of oemcrypto usage tables.  It is used for
 // devices that upgrade from v12 to v13 in the field, and need to convert from

libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_rsa_key_shared.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_rsa_key_shared.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef OEMCRYPTO_RSA_KEY_SHARED_H_
 #define OEMCRYPTO_RSA_KEY_SHARED_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_scoped_ptr.h

@@ -1,3 +1,6 @@
+// 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 OEMCRYPTO_SCOPED_PTR_H_
 #define OEMCRYPTO_SCOPED_PTR_H_
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_session.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_session.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef REF_OEMCRYPTO_SESSION_H_
 #define REF_OEMCRYPTO_SESSION_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_session_key_table.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_session_key_table.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef REF_OEMCRYPTO_SESSION_KEY_TABLE_H_
 #define REF_OEMCRYPTO_SESSION_KEY_TABLE_H_

libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.cpp

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #include "oemcrypto_usage_table_ref.h"
 

libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.h

@@ -2,7 +2,7 @@
 // source code may only be used and distributed under the Widevine Master
 // License Agreement.
 //
-//  Ref implementation of OEMCrypto APIs
+//  Reference implementation of OEMCrypto APIs
 //
 #ifndef OEMCRYPTO_USAGE_TABLE_REF_H_
 #define OEMCRYPTO_USAGE_TABLE_REF_H_

libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp

@@ -142,10 +142,10 @@ TEST_F(OEMCryptoAndroidOCTest, MinVersionNumber13) {
   ASSERT_GE(version, 13u);
 }
 
-// These tests are required for Pi MR1 Android devices.
-class OEMCryptoAndroidPiMR1Test : public OEMCryptoAndroidOCTest {};
+// These tests are required for Q Android devices.
+class OEMCryptoAndroidQTest : public OEMCryptoAndroidOCTest {};
 
-TEST_F(OEMCryptoAndroidPiMR1Test, MinVersionNumber14) {
+TEST_F(OEMCryptoAndroidQTest, MinVersionNumber14) {
   uint32_t version = OEMCrypto_APIVersion();
   ASSERT_GE(version, 14u);
 }