Index: base/nss_util.cc |
diff --git a/base/nss_util.cc b/base/nss_util.cc |
index fe78fe0c218bfb37162702f2cf6b5815b52cbe41..935d7ed40838183c224b086989d7fa47d71b2e63 100644 |
--- a/base/nss_util.cc |
+++ b/base/nss_util.cc |
@@ -2,27 +2,36 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/nss_util.h" |
-#include "base/nss_util_internal.h" |
-#include <nss.h> |
-#include <plarena.h> |
-#include <prerror.h> |
-#include <prinit.h> |
-#include <prtime.h> |
-#include <pk11pub.h> |
-#include <secmod.h> |
#if defined(OS_LINUX) |
#include <linux/nfs_fs.h> |
#include <sys/vfs.h> |
#endif |
-#include "base/file_util.h" |
+#include <stdbool.h> |
+#include <stddef.h> |
+#include <string> |
+ |
+#include "base/basictypes.h" |
+#include "base/file_path.h" |
#include "base/lazy_instance.h" |
#include "base/logging.h" |
#include "base/stringprintf.h" |
#include "base/threading/thread_restrictions.h" |
+#include "base/time.h" |
+#include "third_party/nss/mozilla/nsprpub/lib/ds/plarenas.h" |
+#include "third_party/nss/mozilla/nsprpub/pr/include/prerror.h" |
+#include "third_party/nss/mozilla/nsprpub/pr/include/prinit.h" |
+#include "third_party/nss/mozilla/nsprpub/pr/include/prthread.h" |
+#include "third_party/nss/mozilla/nsprpub/pr/include/prtime.h" |
+#include "third_party/nss/mozilla/nsprpub/pr/include/prtypes.h" |
+#include "third_party/nss/mozilla/security/nss/lib/nss/nss.h" |
+#include "third_party/nss/mozilla/security/nss/lib/pk11wrap/pk11pub.h" |
+#include "third_party/nss/mozilla/security/nss/lib/pk11wrap/secmod.h" |
+#include "third_party/nss/mozilla/security/nss/lib/softoken/secmodt.h" |
+#include "third_party/nss/mozilla/security/nss/lib/util/seccomon.h" |
+#include "third_party/nss/mozilla/security/nss/lib/util/utilrename.h" |
// USE_NSS means we use NSS for everything crypto-related. If USE_NSS is not |
// defined, such as on Mac and Windows, we use NSS for SSL only -- we don't |