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

Side by Side Diff: net/cert/test_root_certs.h

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 years, 6 months 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 | Annotate | Revision Log
« no previous file with comments | « net/cert/cert_verify_proc_mac.cc ('k') | net/cert/test_root_certs_mac.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef NET_CERT_TEST_ROOT_CERTS_H_ 5 #ifndef NET_CERT_TEST_ROOT_CERTS_H_
6 #define NET_CERT_TEST_ROOT_CERTS_H_ 6 #define NET_CERT_TEST_ROOT_CERTS_H_
7 7
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 void Init(); 89 void Init();
90 90
91 #if defined(USE_NSS) || defined(OS_IOS) 91 #if defined(USE_NSS) || defined(OS_IOS)
92 // It is necessary to maintain a cache of the original certificate trust 92 // It is necessary to maintain a cache of the original certificate trust
93 // settings, in order to restore them when Clear() is called. 93 // settings, in order to restore them when Clear() is called.
94 class TrustEntry; 94 class TrustEntry;
95 std::list<TrustEntry*> trust_cache_; 95 std::list<TrustEntry*> trust_cache_;
96 #elif defined(OS_WIN) 96 #elif defined(OS_WIN)
97 HCERTSTORE temporary_roots_; 97 HCERTSTORE temporary_roots_;
98 #elif defined(OS_MACOSX) 98 #elif defined(OS_MACOSX)
99 base::mac::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_; 99 base::ScopedCFTypeRef<CFMutableArrayRef> temporary_roots_;
100 bool allow_system_trust_; 100 bool allow_system_trust_;
101 #endif 101 #endif
102 102
103 #if defined(OS_WIN) || defined(USE_OPENSSL) 103 #if defined(OS_WIN) || defined(USE_OPENSSL)
104 // True if there are no temporarily trusted root certificates. 104 // True if there are no temporarily trusted root certificates.
105 bool empty_; 105 bool empty_;
106 #endif 106 #endif
107 107
108 DISALLOW_COPY_AND_ASSIGN(TestRootCerts); 108 DISALLOW_COPY_AND_ASSIGN(TestRootCerts);
109 }; 109 };
(...skipping 15 matching lines...) Expand all
125 125
126 private: 126 private:
127 scoped_refptr<X509Certificate> cert_; 127 scoped_refptr<X509Certificate> cert_;
128 128
129 DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot); 129 DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot);
130 }; 130 };
131 131
132 } // namespace net 132 } // namespace net
133 133
134 #endif // NET_CERT_TEST_ROOT_CERTS_H_ 134 #endif // NET_CERT_TEST_ROOT_CERTS_H_
OLDNEW
« no previous file with comments | « net/cert/cert_verify_proc_mac.cc ('k') | net/cert/test_root_certs_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698