| Index: chrome/common/net/x509_certificate_model_nss.cc
|
| ===================================================================
|
| --- chrome/common/net/x509_certificate_model_nss.cc (revision 81350)
|
| +++ chrome/common/net/x509_certificate_model_nss.cc (working copy)
|
| @@ -1,4 +1,4 @@
|
| -// 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.
|
|
|
| @@ -13,8 +13,8 @@
|
| #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"
|
| @@ -190,8 +190,8 @@
|
| 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;
|
|
|
| Property changes on: chrome\common\net\x509_certificate_model_nss.cc
|
| ___________________________________________________________________
|
| Added: svn:eol-style
|
| + LF
|
|
|
|
|