diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 09:56:51 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-28 09:56:51 +0000 |
| commit | 190933f29103844bbc40a88bca8b14e49bf7e008 (patch) | |
| tree | 8a14ff4d9011f73175a12f851d5fb039c45bd41c /chromeos/network/network_cert_migrator_unittest.cc | |
| parent | a017c66088a4671cf0ea59be150c73d3679f31d4 (diff) | |
| download | chromium_src-190933f29103844bbc40a88bca8b14e49bf7e008.zip chromium_src-190933f29103844bbc40a88bca8b14e49bf7e008.tar.gz chromium_src-190933f29103844bbc40a88bca8b14e49bf7e008.tar.bz2 | |
Extract ScopedTestNSSDB from nss_util.
Before ScopedTestNSSDB affected several slot getters from nss_util.h .
This change reduces ScopedTestNSSDB to solely setup a temporary test DB and not influencing the global state in nss_util anymore.
As a replacement for some of its old behavior, a new ScopedTestSystemNSSKeySlot is added, which allows to override the slot returned by GetSystemNSSKeySlot().
With this change it's now possible to write tests that need both a user and system NSS DB by using ScopedTestSystemNSSKeySlot.
As a side-effect, GetPersistentNSSKeySlot() is now compiled on !OS_CHROMEOS only.
BUG=210525
(For include changes:)
R=rsleevi@chromium.org
TBR=nkostylev@chromium.org, stevenjb@chromium.org
Review URL: https://codereview.chromium.org/401623006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_cert_migrator_unittest.cc')
| -rw-r--r-- | chromeos/network/network_cert_migrator_unittest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chromeos/network/network_cert_migrator_unittest.cc b/chromeos/network/network_cert_migrator_unittest.cc index 1482ec3..2f72cfd 100644 --- a/chromeos/network/network_cert_migrator_unittest.cc +++ b/chromeos/network/network_cert_migrator_unittest.cc @@ -14,8 +14,8 @@ #include "chromeos/dbus/shill_service_client.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/tpm_token_loader.h" -#include "crypto/nss_util.h" #include "crypto/nss_util_internal.h" +#include "crypto/scoped_test_nss_chromeos_user.h" #include "net/base/crypto_module.h" #include "net/base/net_errors.h" #include "net/base/test_data_directory.h" |