Index: net/base/x509_certificate_win.cc |
=================================================================== |
--- net/base/x509_certificate_win.cc (revision 80572) |
+++ net/base/x509_certificate_win.cc (working copy) |
@@ -1,17 +1,17 @@ |
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
#include "net/base/x509_certificate.h" |
-#include "base/crypto/rsa_private_key.h" |
-#include "base/crypto/scoped_capi_types.h" |
#include "base/lazy_instance.h" |
#include "base/logging.h" |
#include "base/pickle.h" |
#include "base/string_tokenizer.h" |
#include "base/string_util.h" |
#include "base/utf_string_conversions.h" |
+#include "crypto/rsa_private_key.h" |
+#include "crypto/scoped_capi_types.h" |
#include "net/base/cert_status_flags.h" |
#include "net/base/cert_verify_result.h" |
#include "net/base/ev_root_ca_metadata.h" |
@@ -27,10 +27,10 @@ |
namespace { |
-typedef base::ScopedCAPIHandle< |
+typedef crypto::ScopedCAPIHandle< |
HCERTSTORE, |
- base::CAPIDestroyerWithFlags<HCERTSTORE, |
- CertCloseStore, 0> > ScopedHCERTSTORE; |
+ crypto::CAPIDestroyerWithFlags<HCERTSTORE, |
+ CertCloseStore, 0> > ScopedHCERTSTORE; |
struct FreeChainEngineFunctor { |
void operator()(HCERTCHAINENGINE engine) const { |
@@ -39,7 +39,7 @@ |
} |
}; |
-typedef base::ScopedCAPIHandle<HCERTCHAINENGINE, FreeChainEngineFunctor> |
+typedef crypto::ScopedCAPIHandle<HCERTCHAINENGINE, FreeChainEngineFunctor> |
ScopedHCERTCHAINENGINE; |
//----------------------------------------------------------------------------- |
@@ -529,7 +529,7 @@ |
// static |
X509Certificate* X509Certificate::CreateSelfSigned( |
- base::RSAPrivateKey* key, |
+ crypto::RSAPrivateKey* key, |
const std::string& subject, |
uint32 serial_number, |
base::TimeDelta valid_duration) { |