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

Unified Diff: chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

Issue 419013003: Replace c/b/nss_context by a KeyedService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added cert_database namespace. Created 6 years, 2 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/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();
}

Powered by Google App Engine
This is Rietveld 408576698