Replace c/b/nss_context by a KeyedService.

chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_apitest_nss.cc

 // Copyright 2014 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 <cryptohi.h>
 
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #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"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_utils.h"
 #include "crypto/nss_util_internal.h"
 #include "crypto/scoped_test_system_nss_key_slot.h"
 #include "extensions/browser/notification_types.h"
 #include "net/base/net_errors.h"
@@ skipping 133 matching lines @@
 
   SystemToken system_token_;
   DeviceStatus device_status_;
   UserAffiliation user_affiliation_;
 };
 
 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);
 
     // Enable the WebCrypto API.
     command_line->AppendSwitch(
         switches::kEnableExperimentalWebPlatformFeatures);
 
     std::string user_email = "someuser@anydomain.com";
 
@@ skipping 40 matching lines @@
 
     // Enable the URLRequestMock, which is required for force-installing the
     // test extension through policy.
     content::BrowserThread::PostTask(
         content::BrowserThread::IO,
         FROM_HERE,
         base::Bind(chrome_browser_net::SetUrlRequestMocksEnabled, true));
 
     {
       base::RunLoop loop;
-      GetNSSCertDatabaseForProfile(
-          browser()->profile(),
-          base::Bind(&EnterprisePlatformKeysTest::DidGetCertDatabase,
-                     base::Unretained(this),
-                     loop.QuitClosure()));
+      cert_database::CertDatabaseServiceFactory::GetForBrowserContext(
+          browser()->profile())
+          ->GetNSSCertDatabase(

[Joao da Silva, 2014/10/30 09:48:01]

The service might be NULL, but I think this works for the test

[pneubeck (no reviews), 2014/11/05 14:53:36]

Done.

+              base::Bind(&EnterprisePlatformKeysTest::DidGetCertDatabase,
+                         base::Unretained(this),
+                         loop.QuitClosure()));
       loop.Run();
     }
 
     SetPolicy();
   }
 
   virtual void TearDownOnMainThread() override {
     ExtensionApiTest::TearDownOnMainThread();
 
     if (GetParam().system_token_ == SYSTEM_TOKEN_EXISTS) {
@@ skipping 101 matching lines @@
     CheckSystemTokenAvailability,
     EnterprisePlatformKeysTest,
     ::testing::Values(Params(SYSTEM_TOKEN_EXISTS,
                              DEVICE_STATUS_ENROLLED,
                              USER_AFFILIATION_ENROLLED_DOMAIN),
                       Params(SYSTEM_TOKEN_EXISTS,
                              DEVICE_STATUS_ENROLLED,
                              USER_AFFILIATION_UNRELATED),
                       Params(SYSTEM_TOKEN_EXISTS,
                              DEVICE_STATUS_NOT_ENROLLED,
-                             USER_AFFILIATION_UNRELATED),
-                      Params(SYSTEM_TOKEN_NOT_EXISTS,
-                             DEVICE_STATUS_ENROLLED,
-                             USER_AFFILIATION_ENROLLED_DOMAIN)));
+                             USER_AFFILIATION_UNRELATED)));
+// TODO(pneubeck): Enable this case again, once TPMTokenLoader can handle a
+// missing system token correctly. https://crbug.com/426773
+//                      Params(SYSTEM_TOKEN_NOT_EXISTS,
+//                             DEVICE_STATUS_ENROLLED,
+//                             USER_AFFILIATION_ENROLLED_DOMAIN)
 
 class EnterprisePlatformKeysTestNonPolicyInstalledExtension
     : public EnterprisePlatformKeysTest {};
 
 // Ensure that extensions that are not pre-installed by policy throw an install
 // warning if they request the enterprise.platformKeys permission in the
 // manifest and that such extensions don't see the
 // chrome.enterprise.platformKeys namespace.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
                        EnterprisePlatformKeysIsRestrictedToPolicyExtension) {
   ASSERT_TRUE(RunExtensionSubtest("enterprise_platform_keys",
                                   "api_not_available.html",
                                   kFlagIgnoreManifestWarnings));
 
   base::FilePath extension_path =
       test_data_dir_.AppendASCII("enterprise_platform_keys");
   ExtensionService* service =
       extensions::ExtensionSystem::Get(profile())->extension_service();
   const extensions::Extension* extension =
       GetExtensionByPath(service->extensions(), extension_path);
   ASSERT_FALSE(extension->install_warnings().empty());
   EXPECT_EQ(
       "'enterprise.platformKeys' is not allowed for specified install "
       "location.",
       extension->install_warnings()[0].message);
 }