| Index: net/base/keygen_handler_nss.cc
|
| ===================================================================
|
| --- net/base/keygen_handler_nss.cc (revision 80572)
|
| +++ net/base/keygen_handler_nss.cc (working copy)
|
| @@ -1,14 +1,14 @@
|
| -// Copyright (c) 2010 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 "net/base/keygen_handler.h"
|
|
|
| -#include "base/crypto/crypto_module_blocking_password_delegate.h"
|
| -#include "base/crypto/scoped_nss_types.h"
|
| #include "base/logging.h"
|
| -#include "base/nss_util.h"
|
| -#include "base/nss_util_internal.h"
|
| +#include "crypto/crypto_module_blocking_password_delegate.h"
|
| +#include "crypto/nss_util.h"
|
| +#include "crypto/nss_util_internal.h"
|
| +#include "crypto/scoped_nss_types.h"
|
| #include "net/third_party/mozilla_security_manager/nsKeygenHandler.h"
|
|
|
| // PSM = Mozilla's Personal Security Manager.
|
| @@ -18,10 +18,10 @@
|
|
|
| std::string KeygenHandler::GenKeyAndSignChallenge() {
|
| // Ensure NSS is initialized.
|
| - base::EnsureNSSInit();
|
| + crypto::EnsureNSSInit();
|
|
|
| // TODO(mattm): allow choosing which slot to generate and store the key?
|
| - base::ScopedPK11Slot slot(base::GetDefaultNSSKeySlot());
|
| + crypto::ScopedPK11Slot slot(crypto::GetDefaultNSSKeySlot());
|
| if (!slot.get()) {
|
| LOG(ERROR) << "Couldn't get internal key slot!";
|
| return std::string();
|
| @@ -39,7 +39,7 @@
|
| }
|
|
|
| void KeygenHandler::set_crypto_module_password_delegate(
|
| - base::CryptoModuleBlockingPasswordDelegate* delegate) {
|
| + crypto::CryptoModuleBlockingPasswordDelegate* delegate) {
|
| crypto_module_password_delegate_.reset(delegate);
|
| }
|
|
|
|
|