| Index: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
|
| diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
|
| index cf5c23d0c27b187370f08bcb7373bf976f5e839f..ac227d2e1f7233c5410b72d3872d663a21812afa 100644
|
| --- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
|
| +++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc
|
| @@ -9,10 +9,12 @@
|
| #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
|
| #include "chrome/browser/extensions/extension_apitest.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| -#include "chrome/browser/net/nss_context.h"
|
| +#include "chrome/browser/net/cert_database_service_factory.h"
|
| #include "chrome/browser/net/url_request_mock_util.h"
|
| #include "chromeos/chromeos_switches.h"
|
| #include "chromeos/login/user_names.h"
|
| +#include "chromeos/tpm_token_loader.h"
|
| +#include "components/cert_database/public/cert_database_service.h"
|
| #include "components/policy/core/browser/browser_policy_connector.h"
|
| #include "components/policy/core/common/mock_configuration_policy_provider.h"
|
| #include "components/policy/core/common/policy_map.h"
|
| @@ -166,7 +168,9 @@ class EnterprisePlatformKeysTest
|
| : public ExtensionApiTest,
|
| public ::testing::WithParamInterface<Params> {
|
| public:
|
| - EnterprisePlatformKeysTest() {}
|
| + EnterprisePlatformKeysTest() {
|
| + chromeos::TPMTokenLoader::InitializeForTest();
|
| + }
|
|
|
| virtual void SetUpCommandLine(CommandLine* command_line) override {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
| @@ -227,11 +231,11 @@ class EnterprisePlatformKeysTest
|
|
|
| {
|
| base::RunLoop loop;
|
| - GetNSSCertDatabaseForProfile(
|
| - browser()->profile(),
|
| - base::Bind(&EnterprisePlatformKeysTest::DidGetCertDatabase,
|
| - base::Unretained(this),
|
| - loop.QuitClosure()));
|
| + CertDatabaseServiceFactory::GetForBrowserContext(browser()->profile())
|
| + ->GetNSSCertDatabase(
|
| + base::Bind(&EnterprisePlatformKeysTest::DidGetCertDatabase,
|
| + base::Unretained(this),
|
| + loop.QuitClosure()));
|
| loop.Run();
|
| }
|
|
|
|
|