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

Side by Side Diff: ios/web/navigation/crw_session_certificate_policy_manager.mm

Issue 1468803002: Switch to static_assert. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assert1
Patch Set: win Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/web/navigation/crw_session_certificate_policy_manager.h" 5 #import "ios/web/navigation/crw_session_certificate_policy_manager.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/strings/sys_string_conversions.h" 13 #include "base/strings/sys_string_conversions.h"
14 #include "ios/web/public/certificate_policy_cache.h" 14 #include "ios/web/public/certificate_policy_cache.h"
15 #include "ios/web/public/web_thread.h" 15 #include "ios/web/public/web_thread.h"
16 #include "net/cert/x509_certificate.h" 16 #include "net/cert/x509_certificate.h"
17 17
18 // Break if we detect that CertStatus values changed, because we persist them on 18 // Break if we detect that CertStatus values changed, because we persist them on
19 // disk and thus require them to be consistent. 19 // disk and thus require them to be consistent.
20 COMPILE_ASSERT(net::CERT_STATUS_ALL_ERRORS == 0xFFFF, 20 static_assert(net::CERT_STATUS_ALL_ERRORS == 0xFFFF,
21 cert_status_value_changed); 21 "cert_status_value_changed");
22 COMPILE_ASSERT(net::CERT_STATUS_COMMON_NAME_INVALID == 1 << 0, 22 static_assert(net::CERT_STATUS_COMMON_NAME_INVALID == 1 << 0,
23 cert_status_value_changed); 23 "cert_status_value_changed");
24 COMPILE_ASSERT(net::CERT_STATUS_DATE_INVALID == 1 << 1, 24 static_assert(net::CERT_STATUS_DATE_INVALID == 1 << 1,
25 cert_status_value_changed); 25 "cert_status_value_changed");
26 COMPILE_ASSERT(net::CERT_STATUS_AUTHORITY_INVALID == 1 << 2, 26 static_assert(net::CERT_STATUS_AUTHORITY_INVALID == 1 << 2,
27 cert_status_value_changed); 27 "cert_status_value_changed");
28 COMPILE_ASSERT(net::CERT_STATUS_NO_REVOCATION_MECHANISM == 1 << 4, 28 static_assert(net::CERT_STATUS_NO_REVOCATION_MECHANISM == 1 << 4,
29 cert_status_value_changed); 29 "cert_status_value_changed");
30 COMPILE_ASSERT(net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION == 1 << 5, 30 static_assert(net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION == 1 << 5,
31 cert_status_value_changed); 31 "cert_status_value_changed");
32 COMPILE_ASSERT(net::CERT_STATUS_REVOKED == 1 << 6, 32 static_assert(net::CERT_STATUS_REVOKED == 1 << 6, "cert_status_value_changed");
33 cert_status_value_changed); 33 static_assert(net::CERT_STATUS_INVALID == 1 << 7, "cert_status_value_changed");
34 COMPILE_ASSERT(net::CERT_STATUS_INVALID == 1 << 7, 34 static_assert(net::CERT_STATUS_WEAK_SIGNATURE_ALGORITHM == 1 << 8,
35 cert_status_value_changed); 35 "cert_status_value_changed");
36 COMPILE_ASSERT(net::CERT_STATUS_WEAK_SIGNATURE_ALGORITHM == 1 << 8, 36 static_assert(net::CERT_STATUS_NON_UNIQUE_NAME == 1 << 10,
37 cert_status_value_changed); 37 "cert_status_value_changed");
38 COMPILE_ASSERT(net::CERT_STATUS_NON_UNIQUE_NAME == 1 << 10, 38 static_assert(net::CERT_STATUS_WEAK_KEY == 1 << 11,
39 cert_status_value_changed); 39 "cert_status_value_changed");
40 COMPILE_ASSERT(net::CERT_STATUS_WEAK_KEY == 1 << 11, 40 static_assert(net::CERT_STATUS_IS_EV == 1 << 16, "cert_status_value_changed");
41 cert_status_value_changed); 41 static_assert(net::CERT_STATUS_REV_CHECKING_ENABLED == 1 << 17,
42 COMPILE_ASSERT(net::CERT_STATUS_IS_EV == 1 << 16, 42 "cert_status_value_changed");
43 cert_status_value_changed);
44 COMPILE_ASSERT(net::CERT_STATUS_REV_CHECKING_ENABLED == 1 << 17,
45 cert_status_value_changed);
46 43
47 namespace { 44 namespace {
48 45
49 NSString* const kAllowedCertificatesKey = @"allowedCertificates"; 46 NSString* const kAllowedCertificatesKey = @"allowedCertificates";
50 47
51 struct AllowedCertificate { 48 struct AllowedCertificate {
52 scoped_refptr<net::X509Certificate> certificate; 49 scoped_refptr<net::X509Certificate> certificate;
53 std::string host; 50 std::string host;
54 }; 51 };
55 52
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 } 170 }
174 171
175 - (id)copyWithZone:(NSZone*)zone { 172 - (id)copyWithZone:(NSZone*)zone {
176 DCHECK([NSThread isMainThread]); 173 DCHECK([NSThread isMainThread]);
177 CRWSessionCertificatePolicyManager* copy = [[[self class] alloc] init]; 174 CRWSessionCertificatePolicyManager* copy = [[[self class] alloc] init];
178 copy->allowed_ = allowed_; 175 copy->allowed_ = allowed_;
179 return copy; 176 return copy;
180 } 177 }
181 178
182 @end 179 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698