Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(476)

Unified Diff: net/base/transport_security_state.cc

Issue 8776012: Remove all 192 static initializers from transport_security_state.cc (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: rebase Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/transport_security_state.cc
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 6cc2252974e67212a38040959246be40886b330f..ce9cd43d2cd530c094a98c5e9c5545715cd52089 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -923,10 +923,10 @@ static const char* const kGoogleRejectedCerts[] = {
kSPKIHash_Vodafone,
NULL,
};
-static const PublicKeyPins kGooglePins = {
- kGoogleAcceptableCerts,
- kGoogleRejectedCerts,
-};
+#define kGooglePins { \
+ kGoogleAcceptableCerts, \
+ kGoogleRejectedCerts, \
+}
static const char* const kTorAcceptableCerts[] = {
kSPKIHash_RapidSSL,
@@ -936,10 +936,10 @@ static const char* const kTorAcceptableCerts[] = {
kSPKIHash_Tor3,
NULL,
};
-static const PublicKeyPins kTorPins = {
- kTorAcceptableCerts,
- kNoRejectedPublicKeys,
-};
+#define kTorPins { \
+ kTorAcceptableCerts, \
+ kNoRejectedPublicKeys, \
+}
static const char* const kTwitterComAcceptableCerts[] = {
kSPKIHash_VeriSignClass1,
@@ -963,10 +963,10 @@ static const char* const kTwitterComAcceptableCerts[] = {
kSPKIHash_Twitter1,
NULL,
};
-static const PublicKeyPins kTwitterComPins = {
- kTwitterComAcceptableCerts,
- kNoRejectedPublicKeys,
-};
+#define kTwitterComPins { \
+ kTwitterComAcceptableCerts, \
+ kNoRejectedPublicKeys, \
+}
// kTestAcceptableCerts doesn't actually match any public keys and is used
// with "pinningtest.appspot.com", below, to test if pinning is active.
@@ -974,14 +974,14 @@ static const char* const kTestAcceptableCerts[] = {
"sha1/AAAAAAAAAAAAAAAAAAAAAAAAAAA=",
NULL,
};
-static const PublicKeyPins kTestPins = {
- kTestAcceptableCerts,
- kNoRejectedPublicKeys,
-};
+#define kTestPins { \
+ kTestAcceptableCerts, \
+ kNoRejectedPublicKeys, \
+}
-static const PublicKeyPins kNoPins = {
- NULL, NULL,
-};
+#define kNoPins { \
+ NULL, NULL, \
+}
#if defined(OS_CHROMEOS)
static const bool kTwitterHSTS = true;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698