From c1444fef13763a4f19215bdffb148f4d1a6c6098 Mon Sep 17 00:00:00 2001
From: "deanm@google.com"
 <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 17 Sep 2008 09:42:51 +0000
Subject: Some cleanup to hmac_nss / nss_init.  Move the anonymous namespaces
 out of the base namespace.  DCHECK the result to NSS_Shutdown.  Remove the
 comment about nss.h and move to to it's appropiate place.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2301 0039d316-1c4b-4281-b951-d872f2087c98
---
 base/nss_init.cc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'base/nss_init.cc')

diff --git a/base/nss_init.cc b/base/nss_init.cc
index 6427e94..c5c10c4 100644
--- a/base/nss_init.cc
+++ b/base/nss_init.cc
@@ -4,14 +4,10 @@
 
 #include "base/nss_init.h"
 
-#include "base/logging.h"
-#include "base/singleton.h"
-
-// Include this header last, since NSS will define "Lock" in an enum.
-//   https://bugzilla.mozilla.org/show_bug.cgi?id=455424
 #include <nss.h>
 
-namespace base {
+#include "base/logging.h"
+#include "base/singleton.h"
 
 namespace {
 
@@ -22,12 +18,15 @@ class NSSInitSingleton {
   }
 
   ~NSSInitSingleton() {
-    NSS_Shutdown();
+    SECStatus status = NSS_Shutdown();
+    DCHECK(status == SECSuccess);
   }
 };
 
 }  // namespace
 
+namespace base {
+
 void EnsureNSSInit() {
   Singleton<NSSInitSingleton>::get();
 }
-- 
cgit v1.1