Alphabetize & Googleize Header Inclusions

(This is a merge of http://go/wvgerrit/13761 from the Widevine
repository.)

This cleans up our includes to be in Google Style Guide order and in
alphabetic order, for the parts of the code that are expected to
follow Google Style.

This also converts places in our code that were including C headers
in the C++ style (i.e. <cstring> instead of <string.h>) to use C style
instead. This is because, although it was not causing problems for us
yet, on Android these actually include different headers. (<cstring>
is provided by libcxx, while <string.h> is provided by Bionic)

Lastly, this change puts all headers that do not come from within our
project in <brackets> instead of "quotes," which was not being done
consistently.

This change is explicitly NOT trying to standardize the spacing of our
header includes. I have tried to respect, in each file, the spacing
style already present.

Change-Id: If3dc06532ab9b68010285d64518ef21dce3d6354

libwvdrmengine/cdm/core/include/cdm_client_property_set.h

@@ -3,9 +3,9 @@
 #ifndef WVCDM_CORE_CDM_CLIENT_PROPERTY_SET_H_
 #define WVCDM_CORE_CDM_CLIENT_PROPERTY_SET_H_
 
+#include <stdint.h>
 #include <string>
 #include <vector>
-#include <stdint.h>
 
 namespace wvcdm {
 

libwvdrmengine/cdm/core/include/crypto_session.h

@@ -3,8 +3,8 @@
 #ifndef WVCDM_CORE_CRYPTO_SESSSION_H_
 #define WVCDM_CORE_CRYPTO_SESSSION_H_
 
-#include <string>
 #include <map>
+#include <string>
 
 #include "lock.h"
 #include "oemcrypto_adapter.h"

libwvdrmengine/cdm/core/include/file_store.h

@@ -5,11 +5,11 @@
 #ifndef WVCDM_CORE_FILE_STORE_H_
 #define WVCDM_CORE_FILE_STORE_H_
 
-#include "wv_cdm_types.h"
-
 #include <stddef.h>
 #include <stdlib.h>
 
+#include "wv_cdm_types.h"
+
 namespace wvcdm {
 
 // File class. The implementation is platform dependent.

libwvdrmengine/cdm/core/include/properties.h

@@ -12,7 +12,7 @@
 #include "wv_cdm_types.h"
 
 #if defined(UNIT_TEST)
-# include "gtest/gtest_prod.h"
+# include <gtest/gtest_prod.h>
 #endif
 
 namespace wvcdm {

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -3,8 +3,8 @@
 #ifndef WVCDM_CORE_WV_CDM_TYPES_H_
 #define WVCDM_CORE_WV_CDM_TYPES_H_
 
-#include <map>
 #include <stdint.h>
+#include <map>
 #include <string>
 #include <vector>
 

libwvdrmengine/cdm/core/src/cdm_session.cpp

@@ -2,9 +2,9 @@
 
 #include "cdm_session.h"
 
+#include <stdlib.h>
 #include <iostream>
 #include <sstream>
-#include <stdlib.h>
 
 #include "cdm_engine.h"
 #include "clock.h"

libwvdrmengine/cdm/core/src/crypto_session.cpp

@@ -6,8 +6,8 @@
 #include "crypto_session.h"
 
 #include <arpa/inet.h>  // needed for ntoh()
-#include <iostream>
 #include <string.h>
+#include <iostream>
 
 #include "crypto_key.h"
 #include "log.h"

libwvdrmengine/cdm/core/src/device_files.cpp

@@ -2,6 +2,15 @@
 
 #include "device_files.h"
 
+#include <string.h>
+#include <string>
+
+#include "device_files.pb.h"
+#include "file_store.h"
+#include "log.h"
+#include "properties.h"
+#include "string_conversions.h"
+
 #if defined(__APPLE__)
 #include <CommonCrypto/CommonDigest.h>
 #define SHA256 CC_SHA256
@@ -11,15 +20,6 @@
 #include <openssl/md5.h>
 #endif
 
-#include <cstring>
-#include <string>
-
-#include "device_files.pb.h"
-#include "file_store.h"
-#include "log.h"
-#include "properties.h"
-#include "string_conversions.h"
-
 // Protobuf generated classes.
 using video_widevine_client::sdk::DeviceCertificate;
 using video_widevine_client::sdk::HashedFile;

libwvdrmengine/cdm/core/src/license.cpp

@@ -12,8 +12,8 @@
 #include "device_files.h"
 #include "log.h"
 #include "policy_engine.h"
-#include "properties.h"
 #include "privacy_crypto.h"
+#include "properties.h"
 #include "string_conversions.h"
 #include "wv_cdm_constants.h"
 

libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp

@@ -11,8 +11,8 @@
 
 #include <dlfcn.h>
 #include <stdio.h>
+#include <string.h>
 
-#include <cstring>
 #include <iostream>
 #include <map>
 #include <string>

libwvdrmengine/cdm/core/src/string_conversions.cpp

@@ -4,14 +4,15 @@
 
 #include <arpa/inet.h>
 #include <ctype.h>
-#include <iostream>
-#include <stdio.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <string.h>
+#include <iostream>
 #include <vector>
 
+#include <modp_b64w.h>
+
 #include "log.h"
-#include "modp_b64w.h"
 
 namespace wvcdm {
 

libwvdrmengine/cdm/core/test/base64_test.cpp

@@ -2,7 +2,8 @@
 
 #include <utility>
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
+
 #include "log.h"
 #include "string_conversions.h"
 

libwvdrmengine/cdm/core/test/cdm_engine_test.cpp

@@ -9,9 +9,10 @@
 
 #include <string>
 
+#include <gtest/gtest.h>
+
 #include "cdm_engine.h"
 #include "config_test_env.h"
-#include "gtest/gtest.h"
 #include "initialization_data.h"
 #include "license_request.h"
 #include "log.h"

libwvdrmengine/cdm/core/test/cdm_session_unittest.cpp

@@ -1,9 +1,9 @@
 // Copyright 2014 Google Inc. All Rights Reserved.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "cdm_session.h"
 #include "crypto_key.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "properties.h"
 #include "scoped_ptr.h"
 #include "string_conversions.h"

libwvdrmengine/cdm/core/test/device_files_unittest.cpp

@@ -1,9 +1,9 @@
 // Copyright 2013 Google Inc. All Rights Reserved.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "device_files.h"
 #include "file_store.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "properties.h"
 #include "string_conversions.h"
 #include "wv_cdm_types.h"

libwvdrmengine/cdm/core/test/file_store_unittest.cpp

@@ -1,8 +1,8 @@
 // Copyright 2013 Google Inc. All Rights Reserved.
 
+#include <gtest/gtest.h>
 #include "device_files.h"
 #include "file_store.h"
-#include "gtest/gtest.h"
 #include "properties.h"
 #include "test_vectors.h"
 

libwvdrmengine/cdm/core/test/http_socket_test.cpp

@@ -1,10 +1,10 @@
 // Copyright 2013 Google Inc. All Rights Reserved.
 
 #include <errno.h>
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "http_socket.h"
-#include "scoped_ptr.h"
 #include "log.h"
+#include "scoped_ptr.h"
 #include "string_conversions.h"
 #include "url_request.h"
 

libwvdrmengine/cdm/core/test/initialization_data_unittest.cpp

@@ -1,7 +1,7 @@
 // Copyright 2015 Google Inc. All Rights Reserved.
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "initialization_data.h"
 #include "string_conversions.h"
 #include "wv_cdm_constants.h"

libwvdrmengine/cdm/core/test/license_unittest.cpp

@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc. All Rights Reserved.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include "clock.h"
 #include "crypto_session.h"
-#include "license.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "initialization_data.h"
+#include "license.h"
 #include "policy_engine.h"
 #include "properties.h"
 #include "string_conversions.h"

libwvdrmengine/cdm/core/test/max_res_engine_unittest.cpp

@@ -1,8 +1,8 @@
 // Copyright 2012 Google Inc. All Rights Reserved.
 
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
 #include "crypto_session.h"
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
 #include "license.h"
 #include "max_res_engine.h"
 #include "mock_clock.h"

libwvdrmengine/cdm/core/test/mock_clock.h

@@ -4,7 +4,7 @@
 #define CDM_TEST_MOCK_CLOCK_H_
 
 #include "clock.h"
-#include "gmock/gmock.h"
+#include <gmock/gmock.h>
 
 namespace wvcdm {
 
@@ -15,4 +15,4 @@ class MockClock : public Clock {
 
 }  // wvcdm
 
-#endif  // CDM_TEST_MOCK_CLOCK_H_
+#endif  // CDM_TEST_MOCK_CLOCK_H_

libwvdrmengine/cdm/core/test/policy_engine_unittest.cpp

@@ -5,8 +5,9 @@
 #include <algorithm>
 #include <sstream>
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
 #include "license.h"
 #include "mock_clock.h"
 #include "policy_engine.h"

libwvdrmengine/cdm/core/test/timer_unittest.cpp

@@ -1,6 +1,6 @@
 // Copyright 2013 Google Inc. All Rights Reserved.
 
-#include "gtest/gtest.h"
+#include <gtest/gtest.h>
 #include "timer.h"
 
 namespace wvcdm {

libwvdrmengine/cdm/src/file_store.cpp

@@ -7,10 +7,10 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <sys/sendfile.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <stdio.h>
 #include <unistd.h>
 
 #include "log.h"

libwvdrmengine/cdm/src/lock.cpp

@@ -3,7 +3,7 @@
 // Lock class - provides a simple android specific mutex implementation
 
 #include "lock.h"
-#include "utils/Mutex.h"
+#include <utils/Mutex.h>
 
 namespace wvcdm {
 

libwvdrmengine/cdm/src/log.cpp

@@ -20,7 +20,7 @@
 #define LOG_BUF_SIZE 1024
 
 #include "log.h"
-#include "utils/Log.h"
+#include <utils/Log.h>
 
 namespace wvcdm {
 

libwvdrmengine/cdm/src/properties_android.cpp

@@ -2,11 +2,12 @@
 
 #include "properties.h"
 
+#include <unistd.h>
 #include <sstream>
 #include <string>
-#include <unistd.h>
 
-#include "cutils/properties.h"
+#include <cutils/properties.h>
+
 #include "log.h"
 
 namespace {

libwvdrmengine/cdm/src/timer.cpp

@@ -2,13 +2,14 @@
 //
 // Timer class - provides a simple Android specific timer implementation
 
+#include "timer.h"
+
 #include <unistd.h>
 
-#include "timer.h"
-#include "utils/RefBase.h"
-#include "utils/StrongPointer.h"
-#include "utils/Thread.h"
-#include "utils/Mutex.h"
+#include <utils/Mutex.h>
+#include <utils/RefBase.h>
+#include <utils/StrongPointer.h>
+#include <utils/Thread.h>
 
 namespace wvcdm {
 

libwvdrmengine/oemcrypto/include/level3.h

@@ -9,8 +9,8 @@
 #ifndef LEVEL3_OEMCRYPTO_H_
 #define LEVEL3_OEMCRYPTO_H_
 
-#include<stddef.h>
-#include<stdint.h>
+#include <stddef.h>
+#include <stdint.h>
 
 #include "OEMCryptoCENC.h"
 

libwvdrmengine/oemcrypto/include/oemcrypto_logging.h

@@ -3,11 +3,11 @@
 #ifndef WVOEC_OEMCRYPTO_LOGGING_H_
 #define WVOEC_OEMCRYPTO_LOGGING_H_
 
-#include "OEMCryptoCENC.h"
+#include <iostream>
+#include <string>
 
 #include "log.h"
-#include <string>
-#include <iostream>
+#include "OEMCryptoCENC.h"
 
 namespace wvoec_mock {
 

libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp

@@ -5,24 +5,25 @@
 #include "oemcrypto_engine_mock.h"
 
 #include <arpa/inet.h>
+#include <string.h>
 #include <iostream>
 #include <vector>
-#include <string.h>
+
+#include <openssl/aes.h>
+#include <openssl/bio.h>
+#include <openssl/cmac.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+#include <openssl/rsa.h>
+#include <openssl/sha.h>
+#include <openssl/x509.h>
 
 #include "log.h"
 #include "oemcrypto_key_mock.h"
 #include "oemcrypto_logging.h"
 #include "oemcrypto_usage_table_mock.h"
-#include "openssl/aes.h"
-#include "openssl/bio.h"
-#include "openssl/cmac.h"
-#include "openssl/err.h"
-#include "openssl/evp.h"
-#include "openssl/hmac.h"
-#include "openssl/rand.h"
-#include <openssl/rsa.h>
-#include "openssl/sha.h"
-#include "openssl/x509.h"
 #include "string_conversions.h"
 #include "wv_cdm_constants.h"
 

libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.h

@@ -5,18 +5,18 @@
 #ifndef OEMCRYPTO_ENGINE_MOCK_H_
 #define OEMCRYPTO_ENGINE_MOCK_H_
 
-#include <openssl/rsa.h>
 #include <stdint.h>
 #include <time.h>
 #include <map>
 #include <vector>
 
+#include <openssl/rsa.h>
+
 #include "lock.h"
 #include "oemcrypto_key_mock.h"
 #include "oemcrypto_keybox_mock.h"
-#include "wv_cdm_types.h"
-
 #include "OEMCryptoCENC.h"  // Needed for enum OEMCrypto_Algorithm.
+#include "wv_cdm_types.h"
 
 namespace wvoec_mock {
 

libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp

@@ -4,7 +4,7 @@
 //
 #include "oemcrypto_key_mock.h"
 
-#include <cstring>
+#include <string.h>
 #include <vector>
 
 #include "log.h"

libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp

@@ -5,9 +5,9 @@
 #include "oemcrypto_keybox_mock.h"
 
 #include <arpa/inet.h>  // needed for ntoh()
-#include <string>
-#include <cstring>
+#include <string.h>
 #include <sys/types.h>
+#include <string>
 #include "log.h"
 #include "wvcrc32.h"
 #include "wv_keybox.h"

libwvdrmengine/oemcrypto/mock/src/oemcrypto_mock.cpp

@@ -4,21 +4,21 @@
 //
 #include "OEMCryptoCENC.h"
 
-#include <iostream>
-#include <cstring>
 #include <stdio.h>
+#include <string.h>
 #include <time.h>
+#include <iostream>
 #include <string>
 #include <vector>
+#include <openssl/cmac.h>
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+#include <openssl/sha.h>
 #include "log.h"
 #include "oemcrypto_engine_mock.h"
 #include "oemcrypto_logging.h"
 #include "oemcrypto_usage_table_mock.h"
-#include "openssl/cmac.h"
-#include "openssl/evp.h"
-#include "openssl/hmac.h"
-#include "openssl/rand.h"
-#include "openssl/sha.h"
 #include "string_conversions.h"
 #include "wv_cdm_constants.h"
 

libwvdrmengine/oemcrypto/mock/src/oemcrypto_usage_table_mock.cpp

@@ -4,20 +4,21 @@
 //
 #include "oemcrypto_usage_table_mock.h"
 
-#include <cstring>
+#include <string.h>
 #include <string>
 #include <vector>
 
+#include <openssl/aes.h>
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+#include <openssl/sha.h>
+
 #include "clock.h"
-#include "log.h"
 #include "file_store.h"
-#include "properties.h"
+#include "log.h"
 #include "oemcrypto_engine_mock.h"
 #include "oemcrypto_logging.h"
-#include "openssl/aes.h"
-#include "openssl/rand.h"
-#include "openssl/sha.h"
-#include "openssl/hmac.h"
+#include "properties.h"
 #include "string_conversions.h"
 #include "wv_cdm_constants.h"
 

libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp

@@ -5,6 +5,16 @@
 #include <arpa/inet.h>  // needed for ntoh()
 #include <ctype.h>
 #include <getopt.h>
+#include <stdint.h>
+#include <sys/types.h>
+#include <time.h>
+#include <algorithm>
+#include <iostream>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <gtest/gtest.h>
 #include <openssl/aes.h>
 #include <openssl/cmac.h>
@@ -14,19 +24,10 @@
 #include <openssl/rsa.h>
 #include <openssl/sha.h>
 #include <openssl/x509.h>
-#include <stdint.h>
-#include <sys/types.h>
-#include <time.h>
-#include <algorithm>
-#include <iostream>
-#include <map>
-#include <utility>
-#include <string>
-#include <vector>
 
 #include "log.h"
-#include "OEMCryptoCENC.h"
 #include "oemcrypto_key_mock.h"
+#include "OEMCryptoCENC.h"
 #include "properties.h"
 #include "string_conversions.h"
 #include "wv_cdm_constants.h"