Move crypto files out of base, to a top level directory.

chrome/browser/importer/nss_decryptor_system_nss.cc

-// Copyright (c) 2009 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.
 
 #include "chrome/browser/importer/nss_decryptor_system_nss.h"
 
 #include <pk11pub.h>
 #include <pk11sdr.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/nss_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
+#include "crypto/nss_util.h"
 
 NSSDecryptor::NSSDecryptor() : is_nss_initialized_(false), db_slot_(NULL) {}
 NSSDecryptor::~NSSDecryptor() {
   if (db_slot_) {
     // Deliberately leave the user db open, just in case we need to open more
     // than one, because there's an NSS bug with reopening user dbs.
     // https://bugzilla.mozilla.org/show_bug.cgi?id=506140
     // SECMOD_CloseUserDB(db_slot_);
     PK11_FreeSlot(db_slot_);
   }
 }
 
 bool NSSDecryptor::Init(const FilePath& dll_path, const FilePath& db_path) {
-  base::EnsureNSSInit();
+  crypto::EnsureNSSInit();
   is_nss_initialized_ = true;
   const std::string modspec =
       StringPrintf("configDir='%s' tokenDescription='Firefox NSS database' "
                    "flags=readOnly", db_path.value().c_str());
   db_slot_ = SECMOD_OpenUserDB(modspec.c_str());
   return db_slot_ != NULL;
 }
 
 // This method is based on some NSS code in
 //   security/nss/lib/pk11wrap/pk11sdr.c, CVS revision 1.22
@@ skipping 221 matching lines @@
   }
 
  loser:
   if (arena) PORT_FreeArena(arena, PR_TRUE);
   if (key) PK11_FreeSymKey(key);
   if (params) SECITEM_ZfreeItem(params, PR_TRUE);
   if (possibleResult.data) SECITEM_ZfreeItem(&possibleResult, PR_FALSE);
 
   return rv;
 }