summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-14 22:36:35 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-14 22:36:35 +0000
commit1b1a264ad3d0ecf0e0e19468b3e4b9e1553c2e88 (patch)
treec3617b3e5e0590ed2f01096929ddbb0edac000e2 /net/socket
parent7105ea549a113d4c1d473c305475caa0a866e286 (diff)
downloadchromium_src-1b1a264ad3d0ecf0e0e19468b3e4b9e1553c2e88.zip
chromium_src-1b1a264ad3d0ecf0e0e19468b3e4b9e1553c2e88.tar.gz
chromium_src-1b1a264ad3d0ecf0e0e19468b3e4b9e1553c2e88.tar.bz2
Linux: Add Certificate Info dialog (part 1)
Rename base/nss_init.{h,cc} to base/nss_util.{h,cc}, move PRTimeToBaseTime there. BUG=18119 TEST=Load https://www.google.com, compare to firefox cert dialog. Review URL: http://codereview.chromium.org/500141 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36291 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_nss.cc2
-rw-r--r--net/socket/ssl_test_util.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index bcb57f1..13f02ae 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -58,7 +58,7 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
-#include "base/nss_init.h"
+#include "base/nss_util.h"
#include "base/string_util.h"
#include "net/base/cert_verifier.h"
#include "net/base/io_buffer.h"
diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc
index becb322..cde21f3 100644
--- a/net/socket/ssl_test_util.cc
+++ b/net/socket/ssl_test_util.cc
@@ -20,7 +20,7 @@
#include <ssl.h>
#include <sslerr.h>
#include <pk11pub.h>
-#include "base/nss_init.h"
+#include "base/nss_util.h"
#elif defined(OS_MACOSX)
#include <Security/Security.h>
#include "base/scoped_cftyperef.h"