net: trim allowed Google pins now that we have switched to GIAG2.

net/http/transport_security_state_static.h

Index: net/http/transport_security_state_static.h
diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h
index 3bfc41bfc6cb9d70892b19b0179c49ade0ff5a6c..7680cd6d03c03bcb5bc246cf0c9865b83b89ed45 100644
--- a/net/http/transport_security_state_static.h
+++ b/net/http/transport_security_state_static.h
@@ -22,18 +22,6 @@ static const char kSPKIHash_VeriSignClass3_G3[] =
     "\x22\xf1\x9e\x2e\xc6\xea\xcc\xfc\x5d\x23"
     "\x46\xf4\xc2\xe8\xf6\xc5\x54\xdd\x5e\x07";
 
-static const char kSPKIHash_Google1024[] =
-    "\x40\xc5\x40\x1d\x6f\x8c\xba\xf0\x8b\x00"
-    "\xed\xef\xb1\xee\x87\xd0\x05\xb3\xb9\xcd";
-
-static const char kSPKIHash_Google2048[] =
-    "\x01\xb9\x21\xc5\x8d\x0b\xdf\x8d\xe0\x29"
-    "\xff\x9c\x92\x2e\xcd\x55\x6a\x7e\xa3\x39";
-
-static const char kSPKIHash_GoogleBackup1024[] =
-    "\x7d\x5b\xa3\xca\x8e\x37\x65\x1d\x7c\x71"
-    "\xc3\xe3\xb7\x74\xcd\xe9\x7b\x1b\x59\x43";
-
 static const char kSPKIHash_GoogleBackup2048[] =
     "\xbe\xae\xce\xca\x34\xa7\xa8\xe7\x28\xf6"
     "\x7c\x8c\x08\x31\x9d\xcb\xbe\xde\x8a\x33";
@@ -42,22 +30,6 @@ static const char kSPKIHash_GoogleG2[] =
     "\x43\xda\xd6\x30\xee\x53\xf8\xa9\x80\xca"
     "\x6e\xfd\x85\xf4\x6a\xa3\x79\x90\xe0\xea";
 
-static const char kSPKIHash_ThawteSGCCA[] =
-    "\x87\x31\xea\x0e\x3d\xf5\xe8\x70\x3e\x83"
-    "\x72\x57\x77\xa9\x65\x3b\x3b\xfa\x5e\x14";
-
-static const char kSPKIHash_VeriSignClass3SSPIntermediateCA[] =
-    "\x99\x6a\x20\x6a\x85\x57\x62\xcb\x9a\xf2"
-    "\x02\x37\xb3\xc0\x69\x5d\xa9\x1e\xc2\x22";
-
-static const char kSPKIHash_EquifaxSecureCA[] =
-    "\x48\xe6\x68\xf9\x2b\xd2\xb2\x95\xd7\x47"
-    "\xd8\x23\x20\x10\x4f\x33\x98\x90\x9f\xd4";
-
-static const char kSPKIHash_Aetna[] =
-    "\x92\x52\xaa\x14\xde\xbf\x80\xae\x30\xaa"
-    "\xd9\x4e\x60\x38\x70\x24\xa5\x43\x2f\x1a";
-
 static const char kSPKIHash_GeoTrustGlobal[] =
     "\xc0\x7a\x98\x68\x8d\x89\xfb\xab\x05\x64"
     "\x0c\x11\x7d\xaa\x7d\x65\xb8\xca\xcc\x4e";
@@ -66,18 +38,6 @@ static const char kSPKIHash_GeoTrustPrimary[] =
     "\xb0\x19\x89\xe7\xef\xfb\x4a\xaf\xcb\x14"
     "\x8f\x58\x46\x39\x76\x22\x41\x50\xe1\xba";
 
-static const char kSPKIHash_Intel[] =
-    "\x0e\xc6\x2a\xf7\x59\xb2\x08\x10\x90\x25"
-    "\x6f\xc3\xdd\xfd\x8a\x66\x31\x30\x2b\xc5";
-
-static const char kSPKIHash_TCTrustCenter[] =
-    "\x83\x3b\x84\x10\x00\x7f\x6e\x4a\x9d\x41"
-    "\x2d\xc4\x22\x39\x36\x6f\x2e\xe5\x5b\xe9";
-
-static const char kSPKIHash_Vodafone[] =
-    "\x0d\x7f\xe1\x5c\x55\x14\x36\x68\x99\xfc"
-    "\x40\xd6\x22\x08\xef\x22\xeb\xd1\x15\x1c";
-
 static const char kSPKIHash_RapidSSL[] =
     "\xa3\x93\x99\xc4\x04\xc3\xb2\x09\xb0\x81"
     "\xc2\x1f\x21\x62\x27\x78\xc2\x74\x8e\x4c";
@@ -268,29 +228,13 @@ static const char* const kTestAcceptableCerts[] = {
 }
 
 static const char* const kGoogleAcceptableCerts[] = {
-  kSPKIHash_VeriSignClass3,
-  kSPKIHash_VeriSignClass3_G3,
-  kSPKIHash_Google1024,
-  kSPKIHash_Google2048,
-  kSPKIHash_GoogleBackup1024,
   kSPKIHash_GoogleBackup2048,
   kSPKIHash_GoogleG2,
-  kSPKIHash_EquifaxSecureCA,
-  kSPKIHash_GeoTrustGlobal,
-  NULL,
-};
-static const char* const kGoogleRejectedCerts[] = {
-  kSPKIHash_Aetna,
-  kSPKIHash_Intel,
-  kSPKIHash_TCTrustCenter,
-  kSPKIHash_Vodafone,
-  kSPKIHash_ThawteSGCCA,
-  kSPKIHash_VeriSignClass3SSPIntermediateCA,
   NULL,
 };
 #define kGooglePins { \
   kGoogleAcceptableCerts, \
-  kGoogleRejectedCerts, \
+  kNoRejectedPublicKeys, \
 }
 
 static const char* const kTorAcceptableCerts[] = {