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

Side by Side Diff: chrome/browser/chromeos/platform_keys/platform_keys_nss.cc

Issue 2724013002: net: remove CryptoModule class (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ssl/ssl_browser_tests.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include <cert.h> 5 #include <cert.h>
6 #include <cryptohi.h> 6 #include <cryptohi.h>
7 #include <keyhi.h> 7 #include <keyhi.h>
8 #include <secder.h> 8 #include <secder.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
(...skipping 19 matching lines...) Expand all
30 #include "chrome/browser/chromeos/platform_keys/platform_keys.h" 30 #include "chrome/browser/chromeos/platform_keys/platform_keys.h"
31 #include "chrome/browser/chromeos/profiles/profile_helper.h" 31 #include "chrome/browser/chromeos/profiles/profile_helper.h"
32 #include "chrome/browser/extensions/api/enterprise_platform_keys/enterprise_plat form_keys_api.h" 32 #include "chrome/browser/extensions/api/enterprise_platform_keys/enterprise_plat form_keys_api.h"
33 #include "chrome/browser/net/nss_context.h" 33 #include "chrome/browser/net/nss_context.h"
34 #include "chrome/browser/profiles/profile.h" 34 #include "chrome/browser/profiles/profile.h"
35 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 35 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
36 #include "content/public/browser/browser_context.h" 36 #include "content/public/browser/browser_context.h"
37 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
38 #include "crypto/nss_key_util.h" 38 #include "crypto/nss_key_util.h"
39 #include "crypto/scoped_nss_types.h" 39 #include "crypto/scoped_nss_types.h"
40 #include "net/base/crypto_module.h"
41 #include "net/base/net_errors.h" 40 #include "net/base/net_errors.h"
42 #include "net/cert/cert_database.h" 41 #include "net/cert/cert_database.h"
43 #include "net/cert/nss_cert_database.h" 42 #include "net/cert/nss_cert_database.h"
44 #include "net/cert/x509_util_nss.h" 43 #include "net/cert/x509_util_nss.h"
45 #include "net/ssl/ssl_cert_request_info.h" 44 #include "net/ssl/ssl_cert_request_info.h"
46 #include "net/third_party/mozilla_security_manager/nsNSSCertificateDB.h" 45 #include "net/third_party/mozilla_security_manager/nsNSSCertificateDB.h"
47 46
48 using content::BrowserContext; 47 using content::BrowserContext;
49 using content::BrowserThread; 48 using content::BrowserThread;
50 49
(...skipping 856 matching lines...) Expand 10 before | Expand all | Expand 10 after
907 NSSOperationState* state_ptr = state.get(); 906 NSSOperationState* state_ptr = state.get();
908 GetCertDatabase(std::string() /* don't get any specific slot */, 907 GetCertDatabase(std::string() /* don't get any specific slot */,
909 base::Bind(&GetTokensWithDB, base::Passed(&state)), 908 base::Bind(&GetTokensWithDB, base::Passed(&state)),
910 browser_context, 909 browser_context,
911 state_ptr); 910 state_ptr);
912 } 911 }
913 912
914 } // namespace platform_keys 913 } // namespace platform_keys
915 914
916 } // namespace chromeos 915 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/certificate_manager_model.cc ('k') | chrome/browser/ssl/ssl_browser_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698