Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1083)

Unified Diff: chrome/browser/importer/nss_decryptor_system_nss.cc

Issue 6805019: Move crypto files out of base, to a top level directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixes comments by eroman Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/importer/nss_decryptor_system_nss.cc
===================================================================
--- chrome/browser/importer/nss_decryptor_system_nss.cc (revision 81350)
+++ chrome/browser/importer/nss_decryptor_system_nss.cc (working copy)
@@ -1,4 +1,4 @@
-// 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.
@@ -9,9 +9,9 @@
#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() {
@@ -25,7 +25,7 @@
}
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' "
« no previous file with comments | « chrome/browser/extensions/sandboxed_extension_unpacker.cc ('k') | chrome/browser/password_manager/encryptor_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698