Move crypto files out of base, to a top level directory.

chrome/common/net/x509_certificate_model_nss.cc

-// Copyright (c) 2010 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 "chrome/common/net/x509_certificate_model.h"
 
 #include <cert.h>
 #include <cms.h>
 #include <hasht.h>
 #include <pk11pub.h>
 #include <sechash.h>
 
 #include <pk11pub.h>
 
 #include "base/logging.h"
-#include "base/nss_util.h"
 #include "base/string_number_conversions.h"
+#include "crypto/nss_util.h"
 #include "net/base/x509_certificate.h"
 #include "chrome/third_party/mozilla_security_manager/nsNSSCertHelper.h"
 #include "chrome/third_party/mozilla_security_manager/nsNSSCertificate.h"
 #include "chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.h"
 
 namespace psm = mozilla_security_manager;
 
 namespace {
 
 // Convert a char* return value from NSS into a std::string and free the NSS
@@ skipping 155 matching lines @@
 
 string GetSubjectCommonName(X509Certificate::OSCertHandle cert_handle,
                             const string& alternative_text) {
   return Stringize(CERT_GetCommonName(&cert_handle->subject), alternative_text);
 }
 
 bool GetTimes(X509Certificate::OSCertHandle cert_handle,
               base::Time* issued, base::Time* expires) {
   PRTime pr_issued, pr_expires;
   if (CERT_GetCertTimes(cert_handle, &pr_issued, &pr_expires) == SECSuccess) {
-    *issued = base::PRTimeToBaseTime(pr_issued);
-    *expires = base::PRTimeToBaseTime(pr_expires);
+    *issued = crypto::PRTimeToBaseTime(pr_issued);
+    *expires = crypto::PRTimeToBaseTime(pr_expires);
     return true;
   }
   return false;
 }
 
 string GetTitle(X509Certificate::OSCertHandle cert_handle) {
   return psm::GetCertTitle(cert_handle);
 }
 
 string GetIssuerName(X509Certificate::OSCertHandle cert_handle) {
@@ skipping 166 matching lines @@
 
 string ProcessRawBitsSignatureWrap(X509Certificate::OSCertHandle cert_handle) {
   return ProcessRawBits(cert_handle->signatureWrap.signature.data,
                         cert_handle->signatureWrap.signature.len);
 }
 
 void RegisterDynamicOids() {
 }
 
 }  // namespace x509_certificate_model