Header cleanup in base....

base/nss_util.cc

 // Copyright (c) 2010 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 "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/magic.h>
 #include <sys/vfs.h>
 #endif
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/singleton.h"
-#include "base/string_util.h"
+#include "base/stringprintf.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
 // use NSS for crypto or certificate verification, and we don't use the NSS
 // certificate and key databases.
 #if defined(USE_NSS)
 #include "base/environment.h"
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
 #endif  // defined(USE_NSS)
 
+namespace base {
+
 namespace {
 
 #if defined(USE_NSS)
 FilePath GetDefaultConfigDirectory() {
   FilePath dir = file_util::GetHomeDir();
   if (dir.empty()) {
     LOG(ERROR) << "Failed to get home directory.";
     return dir;
   }
   dir = dir.AppendASCII(".pki").AppendASCII("nssdb");
@@ skipping 248 matching lines @@
   PK11SlotInfo* test_db_slot_;  // Overrides internal key slot and real_db_slot_
   SECMODModule *root_;
   bool chromeos_user_logged_in_;
 #if defined(USE_NSS)
   scoped_ptr<Lock> write_lock_;
 #endif  // defined(USE_NSS)
 };
 
 }  // namespace
 
-namespace base {
-
 void EnsureNSPRInit() {
   Singleton<NSPRInitSingleton>::get();
 }
 
 void EnsureNSSInit() {
   Singleton<NSSInitSingleton>::get();
 }
 
 #if defined(USE_NSS)
 bool OpenTestNSSDB(const FilePath& path, const char* description) {
@@ skipping 45 matching lines @@
   exploded.millisecond  = prxtime.tm_usec / 1000;
 
   return Time::FromUTCExploded(exploded);
 }
 
 PK11SlotInfo* GetDefaultNSSKeySlot() {
   return Singleton<NSSInitSingleton>::get()->GetDefaultKeySlot();
 }
 
 }  // namespace base