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/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"