Rename PlatformKeysService into ExtensionPlatformKeysService

This CL renames the class to allow creating a service with
the name PlatformKeysService from
chrome/browser/chromeos/platform_keys/platform_keys* files.
That will allow to mock functions from there and write unit
tests for a code that depends on them.

Bug: 1045895
Change-Id: I179c75aa1efc19acf5d6f10a06cf6ea62a11bf30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2064211
Commit-Queue: Michael Ershov <miersh@google.com>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742650}

chrome/browser/chromeos/BUILD.gn

@@ -1693,6 +1693,10 @@ source_set("chromeos") {
     "ownership/owner_settings_service_chromeos.h",
     "ownership/owner_settings_service_chromeos_factory.cc",
     "ownership/owner_settings_service_chromeos_factory.h",
+    "platform_keys/extension_platform_keys_service.cc",
+    "platform_keys/extension_platform_keys_service.h",
+    "platform_keys/extension_platform_keys_service_factory.cc",
+    "platform_keys/extension_platform_keys_service_factory.h",
     "platform_keys/key_permissions.cc",
     "platform_keys/key_permissions.h",
     "platform_keys/key_permissions_policy_handler.cc",
@@ -1700,10 +1704,6 @@ source_set("chromeos") {
     "platform_keys/platform_keys.cc",
     "platform_keys/platform_keys.h",
     "platform_keys/platform_keys_nss.cc",
-    "platform_keys/platform_keys_service.cc",
-    "platform_keys/platform_keys_service.h",
-    "platform_keys/platform_keys_service_factory.cc",
-    "platform_keys/platform_keys_service_factory.h",
     "plugin_vm/plugin_vm_drive_image_download_service.cc",
     "plugin_vm/plugin_vm_drive_image_download_service.h",
     "plugin_vm/plugin_vm_engagement_metrics_service.cc",

chrome/browser/chromeos/platform_keys/platform_keys_service.cc → chrome/browser/chromeos/platform_keys/extension_platform_keys_service.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service.h"
 
 #include <stddef.h>
 
@@ -50,7 +50,7 @@ std::vector<KeyPermissions::KeyLocation> TokenIdsToKeyLocations(
 
 }  // namespace
 
-class PlatformKeysService::Task {
+class ExtensionPlatformKeysService::Task {
  public:
   Task() {}
   virtual ~Task() {}
@@ -61,7 +61,7 @@ class PlatformKeysService::Task {
   DISALLOW_ASSIGN(Task);
 };
 
-class PlatformKeysService::GenerateRSAKeyTask : public Task {
+class ExtensionPlatformKeysService::GenerateRSAKeyTask : public Task {
  public:
   enum class Step {
     GENERATE_KEY,
@@ -78,7 +78,7 @@ class PlatformKeysService::GenerateRSAKeyTask : public Task {
                      const std::string& extension_id,
                      const GenerateKeyCallback& callback,
                      KeyPermissions* key_permissions,
-                     PlatformKeysService* service,
+                     ExtensionPlatformKeysService* service,
                      content::BrowserContext* browser_context)
       : token_id_(token_id),
         modulus_length_(modulus_length),
@@ -175,14 +175,14 @@ class PlatformKeysService::GenerateRSAKeyTask : public Task {
   std::unique_ptr<KeyPermissions::PermissionsForExtension>
       extension_permissions_;
   KeyPermissions* const key_permissions_;
-  PlatformKeysService* const service_;
+  ExtensionPlatformKeysService* const service_;
   content::BrowserContext* const browser_context_;
   base::WeakPtrFactory<GenerateRSAKeyTask> weak_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(GenerateRSAKeyTask);
 };
 
-class PlatformKeysService::SignTask : public Task {
+class ExtensionPlatformKeysService::SignTask : public Task {
  public:
   enum class Step {
     GET_EXTENSION_PERMISSIONS,
@@ -206,7 +206,7 @@ class PlatformKeysService::SignTask : public Task {
            const std::string& extension_id,
            const SignCallback& callback,
            KeyPermissions* key_permissions,
-           PlatformKeysService* service)
+           ExtensionPlatformKeysService* service)
       : token_id_(token_id),
         data_(data),
         public_key_spki_der_(public_key_spki_der),
@@ -331,13 +331,13 @@ class PlatformKeysService::SignTask : public Task {
       extension_permissions_;
   KeyPermissions* const key_permissions_;
   std::vector<KeyPermissions::KeyLocation> key_locations_;
-  PlatformKeysService* const service_;
+  ExtensionPlatformKeysService* const service_;
   base::WeakPtrFactory<SignTask> weak_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(SignTask);
 };
 
-class PlatformKeysService::SelectTask : public Task {
+class ExtensionPlatformKeysService::SelectTask : public Task {
  public:
   enum class Step {
     GET_EXTENSION_PERMISSIONS,
@@ -364,7 +364,7 @@ class PlatformKeysService::SelectTask : public Task {
              const SelectCertificatesCallback& callback,
              content::WebContents* web_contents,
              KeyPermissions* key_permissions,
-             PlatformKeysService* service)
+             ExtensionPlatformKeysService* service)
       : request_(request),
         input_client_certificates_(std::move(input_client_certificates)),
         interactive_(interactive),
@@ -651,19 +651,17 @@ class PlatformKeysService::SelectTask : public Task {
   std::unique_ptr<KeyPermissions::PermissionsForExtension>
       extension_permissions_;
   KeyPermissions* const key_permissions_;
-  PlatformKeysService* const service_;
+  ExtensionPlatformKeysService* const service_;
   base::WeakPtrFactory<SelectTask> weak_factory_{this};
 
   DISALLOW_COPY_AND_ASSIGN(SelectTask);
 };
 
-PlatformKeysService::SelectDelegate::SelectDelegate() {
-}
+ExtensionPlatformKeysService::SelectDelegate::SelectDelegate() {}
 
-PlatformKeysService::SelectDelegate::~SelectDelegate() {
-}
+ExtensionPlatformKeysService::SelectDelegate::~SelectDelegate() {}
 
-PlatformKeysService::PlatformKeysService(
+ExtensionPlatformKeysService::ExtensionPlatformKeysService(
     bool profile_is_managed,
     PrefService* profile_prefs,
     policy::PolicyService* profile_policies,
@@ -678,15 +676,15 @@ PlatformKeysService::PlatformKeysService(
   DCHECK(state_store);
 }
 
-PlatformKeysService::~PlatformKeysService() {
-}
+ExtensionPlatformKeysService::~ExtensionPlatformKeysService() {}
 
-void PlatformKeysService::SetSelectDelegate(
+void ExtensionPlatformKeysService::SetSelectDelegate(
     std::unique_ptr<SelectDelegate> delegate) {
   select_delegate_ = std::move(delegate);
 }
 
-void PlatformKeysService::GenerateRSAKey(const std::string& token_id,
+void ExtensionPlatformKeysService::GenerateRSAKey(
+    const std::string& token_id,
     unsigned int modulus_length,
     const std::string& extension_id,
     const GenerateKeyCallback& callback) {
@@ -696,7 +694,7 @@ void PlatformKeysService::GenerateRSAKey(const std::string& token_id,
       browser_context_));
 }
 
-void PlatformKeysService::SignRSAPKCS1Digest(
+void ExtensionPlatformKeysService::SignRSAPKCS1Digest(
     const std::string& token_id,
     const std::string& data,
     const std::string& public_key_spki_der,
@@ -709,7 +707,7 @@ void PlatformKeysService::SignRSAPKCS1Digest(
       hash_algorithm, extension_id, callback, &key_permissions_, this)));
 }
 
-void PlatformKeysService::SignRSAPKCS1Raw(
+void ExtensionPlatformKeysService::SignRSAPKCS1Raw(
     const std::string& token_id,
     const std::string& data,
     const std::string& public_key_spki_der,
@@ -723,7 +721,7 @@ void PlatformKeysService::SignRSAPKCS1Raw(
                    &key_permissions_, this)));
 }
 
-void PlatformKeysService::SelectClientCertificates(
+void ExtensionPlatformKeysService::SelectClientCertificates(
     const platform_keys::ClientCertificateRequest& request,
     std::unique_ptr<net::CertificateList> client_certificates,
     bool interactive,
@@ -736,13 +734,14 @@ void PlatformKeysService::SelectClientCertificates(
       callback, web_contents, &key_permissions_, this));
 }
 
-void PlatformKeysService::StartOrQueueTask(std::unique_ptr<Task> task) {
+void ExtensionPlatformKeysService::StartOrQueueTask(
+    std::unique_ptr<Task> task) {
   tasks_.push(std::move(task));
   if (tasks_.size() == 1)
     tasks_.front()->Start();
 }
 
-void PlatformKeysService::TaskFinished(Task* task) {
+void ExtensionPlatformKeysService::TaskFinished(Task* task) {
   DCHECK(!tasks_.empty());
   DCHECK(task == tasks_.front().get());
   // Remove all finished tasks from the queue (should be at most one).

chrome/browser/chromeos/platform_keys/platform_keys_service.h → chrome/browser/chromeos/platform_keys/extension_platform_keys_service.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_SERVICE_H_
-#define CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_SERVICE_H_
+#ifndef CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_EXTENSION_PLATFORM_KEYS_SERVICE_H_
+#define CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_EXTENSION_PLATFORM_KEYS_SERVICE_H_
 
 #include <memory>
 #include <string>
@@ -22,7 +22,7 @@ class PrefService;
 namespace content {
 class BrowserContext;
 class WebContents;
-}
+}  // namespace content
 
 namespace extensions {
 class StateStore;
@@ -31,7 +31,7 @@ class StateStore;
 namespace net {
 class X509Certificate;
 typedef std::vector<scoped_refptr<X509Certificate>> CertificateList;
-}
+}  // namespace net
 
 namespace policy {
 class PolicyService;
@@ -39,7 +39,7 @@ class PolicyService;
 
 namespace chromeos {
 
-class PlatformKeysService : public KeyedService {
+class ExtensionPlatformKeysService : public KeyedService {
  public:
   // The SelectDelegate is used to select a single certificate from all
   // certificates matching a request (see SelectClientCertificates). E.g. this
@@ -76,13 +76,14 @@ class PlatformKeysService : public KeyedService {
   // |KeyPermissions| for details.
   // |browser_context| and |state_store| must not be null and outlive this
   // object.
-  explicit PlatformKeysService(bool profile_is_managed,
+  explicit ExtensionPlatformKeysService(
+      bool profile_is_managed,
       PrefService* profile_prefs,
       policy::PolicyService* profile_policies,
       content::BrowserContext* browser_context,
       extensions::StateStore* state_store);
 
-  ~PlatformKeysService() override;
+  ~ExtensionPlatformKeysService() override;
 
   // Sets the delegate which will be used for interactive
   // SelectClientCertificates calls.
@@ -205,11 +206,11 @@ class PlatformKeysService : public KeyedService {
   KeyPermissions key_permissions_;
   std::unique_ptr<SelectDelegate> select_delegate_;
   base::queue<std::unique_ptr<Task>> tasks_;
-  base::WeakPtrFactory<PlatformKeysService> weak_factory_{this};
+  base::WeakPtrFactory<ExtensionPlatformKeysService> weak_factory_{this};
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformKeysService);
+  DISALLOW_COPY_AND_ASSIGN(ExtensionPlatformKeysService);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_SERVICE_H_
+#endif  // CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_EXTENSION_PLATFORM_KEYS_SERVICE_H_

chrome/browser/chromeos/platform_keys/platform_keys_service_factory.cc → chrome/browser/chromeos/platform_keys/extension_platform_keys_service_factory.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service_factory.h"
 
 #include <memory>
 
@@ -13,7 +13,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ -30,7 +30,7 @@ namespace {
 // This delegate selects a certificate by showing the certificate selection
 // dialog to the user.
 class DefaultSelectDelegate
-    : public chromeos::PlatformKeysService::SelectDelegate {
+    : public chromeos::ExtensionPlatformKeysService::SelectDelegate {
  public:
   DefaultSelectDelegate() {}
   ~DefaultSelectDelegate() override {}
@@ -71,33 +71,35 @@ class DefaultSelectDelegate
 }  // namespace
 
 // static
-PlatformKeysService* PlatformKeysServiceFactory::GetForBrowserContext(
+ExtensionPlatformKeysService*
+ExtensionPlatformKeysServiceFactory::GetForBrowserContext(
     content::BrowserContext* context) {
-  return static_cast<PlatformKeysService*>(
+  return static_cast<ExtensionPlatformKeysService*>(
       GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
-PlatformKeysServiceFactory* PlatformKeysServiceFactory::GetInstance() {
-  return base::Singleton<PlatformKeysServiceFactory>::get();
+ExtensionPlatformKeysServiceFactory*
+ExtensionPlatformKeysServiceFactory::GetInstance() {
+  return base::Singleton<ExtensionPlatformKeysServiceFactory>::get();
 }
 
-PlatformKeysServiceFactory::PlatformKeysServiceFactory()
+ExtensionPlatformKeysServiceFactory::ExtensionPlatformKeysServiceFactory()
     : BrowserContextKeyedServiceFactory(
-          "PlatformKeysService",
+          "ExtensionPlatformKeysService",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(extensions::ExtensionSystemFactory::GetInstance());
 }
 
-PlatformKeysServiceFactory::~PlatformKeysServiceFactory() {
-}
+ExtensionPlatformKeysServiceFactory::~ExtensionPlatformKeysServiceFactory() {}
 
-content::BrowserContext* PlatformKeysServiceFactory::GetBrowserContextToUse(
+content::BrowserContext*
+ExtensionPlatformKeysServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
-KeyedService* PlatformKeysServiceFactory::BuildServiceInstanceFor(
+KeyedService* ExtensionPlatformKeysServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   extensions::StateStore* const store =
       extensions::ExtensionSystem::Get(context)->state_store();
@@ -107,7 +109,8 @@ KeyedService* PlatformKeysServiceFactory::BuildServiceInstanceFor(
 
   Profile* const profile = Profile::FromBrowserContext(context);
 
-  PlatformKeysService* const service = new PlatformKeysService(
+  ExtensionPlatformKeysService* const service =
+      new ExtensionPlatformKeysService(
           policy_connector->IsManaged(), profile->GetPrefs(),
           policy_connector->policy_service(), context, store);
 

chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h → chrome/browser/chromeos/platform_keys/extension_platform_keys_service_factory.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_SERVICE_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_SERVICE_FACTORY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_EXTENSION_PLATFORM_KEYS_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_EXTENSION_PLATFORM_KEYS_SERVICE_FACTORY_H_
 
 #include "base/macros.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -15,21 +15,23 @@ struct DefaultSingletonTraits;
 
 namespace chromeos {
 
-class PlatformKeysService;
+class ExtensionPlatformKeysService;
 
-// Factory to create PlatformKeysService.
-class PlatformKeysServiceFactory : public BrowserContextKeyedServiceFactory {
+// Factory to create ExtensionPlatformKeysService.
+class ExtensionPlatformKeysServiceFactory
+    : public BrowserContextKeyedServiceFactory {
  public:
-  static PlatformKeysService* GetForBrowserContext(
+  static ExtensionPlatformKeysService* GetForBrowserContext(
       content::BrowserContext* context);
 
-  static PlatformKeysServiceFactory* GetInstance();
+  static ExtensionPlatformKeysServiceFactory* GetInstance();
 
  private:
-  friend struct base::DefaultSingletonTraits<PlatformKeysServiceFactory>;
+  friend struct base::DefaultSingletonTraits<
+      ExtensionPlatformKeysServiceFactory>;
 
-  PlatformKeysServiceFactory();
-  ~PlatformKeysServiceFactory() override;
+  ExtensionPlatformKeysServiceFactory();
+  ~ExtensionPlatformKeysServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
   content::BrowserContext* GetBrowserContextToUse(
@@ -37,9 +39,9 @@ class PlatformKeysServiceFactory : public BrowserContextKeyedServiceFactory {
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
 
-  DISALLOW_COPY_AND_ASSIGN(PlatformKeysServiceFactory);
+  DISALLOW_COPY_AND_ASSIGN(ExtensionPlatformKeysServiceFactory);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_PLATFORM_KEYS_SERVICE_FACTORY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_PLATFORM_KEYS_EXTENSION_PLATFORM_KEYS_SERVICE_FACTORY_H_

chrome/browser/chromeos/platform_keys/platform_keys.h

@@ -58,8 +58,8 @@ struct ClientCertificateRequest {
 
 namespace subtle {
 // Functions of this namespace shouldn't be called directly from the context of
-// an extension. Instead use PlatformKeysService which enforces restrictions
-// upon extensions.
+// an extension. Instead use ExtensionPlatformKeysService which enforces
+// restrictions upon extensions.
 
 typedef base::Callback<void(const std::string& public_key_spki_der,
                             const std::string& error_message)>

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

@@ -9,9 +9,9 @@
 #include "base/bind.h"
 #include "base/task/post_task.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service_factory.h"
 #include "chrome/browser/chromeos/platform_keys/platform_keys.h"
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h"
 #include "chrome/browser/extensions/api/platform_keys/platform_keys_api.h"
 #include "chrome/common/extensions/api/enterprise_platform_keys.h"
 #include "chrome/common/extensions/api/enterprise_platform_keys_internal.h"
@@ -57,8 +57,8 @@ EnterprisePlatformKeysInternalGenerateKeyFunction::Run() {
   if (!platform_keys::ValidateToken(params->token_id, &platform_keys_token_id))
     return RespondNow(Error(platform_keys::kErrorInvalidToken));
 
-  chromeos::PlatformKeysService* service =
-      chromeos::PlatformKeysServiceFactory::GetForBrowserContext(
+  chromeos::ExtensionPlatformKeysService* service =
+      chromeos::ExtensionPlatformKeysServiceFactory::GetForBrowserContext(
           browser_context());
   DCHECK(service);
 

chrome/browser/extensions/api/platform_keys/platform_keys_api.cc

@@ -12,9 +12,9 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service_factory.h"
 #include "chrome/browser/chromeos/platform_keys/platform_keys.h"
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h"
 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
 #include "chrome/common/extensions/api/platform_keys_internal.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
@@ -75,9 +75,7 @@ const struct NameValuePair {
   const char* const name;
   const int value;
 } kCertStatusErrors[] = {
-#define CERT_STATUS_FLAG(name, value) \
-  { #name, value }                    \
-  ,
+#define CERT_STATUS_FLAG(name, value) {#name, value},
 #include "net/cert/cert_status_flags_list.h"
 #undef CERT_STATUS_FLAG
 };
@@ -120,8 +118,7 @@ std::string PlatformKeysTokenIdToApiId(
 }  // namespace platform_keys
 
 PlatformKeysInternalGetPublicKeyFunction::
-    ~PlatformKeysInternalGetPublicKeyFunction() {
-}
+    ~PlatformKeysInternalGetPublicKeyFunction() {}
 
 ExtensionFunction::ResponseAction
 PlatformKeysInternalGetPublicKeyFunction::Run() {
@@ -170,8 +167,7 @@ PlatformKeysInternalGetPublicKeyFunction::Run() {
 }
 
 PlatformKeysInternalSelectClientCertificatesFunction::
-    ~PlatformKeysInternalSelectClientCertificatesFunction() {
-}
+    ~PlatformKeysInternalSelectClientCertificatesFunction() {}
 
 ExtensionFunction::ResponseAction
 PlatformKeysInternalSelectClientCertificatesFunction::Run() {
@@ -179,8 +175,8 @@ PlatformKeysInternalSelectClientCertificatesFunction::Run() {
       api_pki::SelectClientCertificates::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
-  chromeos::PlatformKeysService* service =
-      chromeos::PlatformKeysServiceFactory::GetForBrowserContext(
+  chromeos::ExtensionPlatformKeysService* service =
+      chromeos::ExtensionPlatformKeysServiceFactory::GetForBrowserContext(
           browser_context());
   DCHECK(service);
 
@@ -289,8 +285,7 @@ void PlatformKeysInternalSelectClientCertificatesFunction::
       api_pki::SelectClientCertificates::Results::Create(result_matches)));
 }
 
-PlatformKeysInternalSignFunction::~PlatformKeysInternalSignFunction() {
-}
+PlatformKeysInternalSignFunction::~PlatformKeysInternalSignFunction() {}
 
 ExtensionFunction::ResponseAction PlatformKeysInternalSignFunction::Run() {
   std::unique_ptr<api_pki::Sign::Params> params(
@@ -303,8 +298,8 @@ ExtensionFunction::ResponseAction PlatformKeysInternalSignFunction::Run() {
     return RespondNow(Error(platform_keys::kErrorInvalidToken));
   }
 
-  chromeos::PlatformKeysService* service =
-      chromeos::PlatformKeysServiceFactory::GetForBrowserContext(
+  chromeos::ExtensionPlatformKeysService* service =
+      chromeos::ExtensionPlatformKeysServiceFactory::GetForBrowserContext(
           browser_context());
   DCHECK(service);
 
@@ -352,8 +347,7 @@ void PlatformKeysInternalSignFunction::OnSigned(
 }
 
 PlatformKeysVerifyTLSServerCertificateFunction::
-    ~PlatformKeysVerifyTLSServerCertificateFunction() {
-}
+    ~PlatformKeysVerifyTLSServerCertificateFunction() {}
 
 ExtensionFunction::ResponseAction
 PlatformKeysVerifyTLSServerCertificateFunction::Run() {

chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc

@@ -13,8 +13,8 @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/post_task.h"
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service.h"
-#include "chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service.h"
+#include "chrome/browser/chromeos/platform_keys/extension_platform_keys_service_factory.h"
 #include "chrome/browser/extensions/api/platform_keys/platform_keys_test_base.h"
 #include "chrome/browser/net/nss_context.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
@@ -105,8 +105,8 @@ class PlatformKeysTest : public PlatformKeysTestBase {
     mock_policy_provider()->UpdateChromePolicy(policy);
   }
 
-  chromeos::PlatformKeysService* GetPlatformKeysService() {
-    return chromeos::PlatformKeysServiceFactory::GetForBrowserContext(
+  chromeos::ExtensionPlatformKeysService* GetExtensionPlatformKeysService() {
+    return chromeos::ExtensionPlatformKeysServiceFactory::GetForBrowserContext(
         profile());
   }
 
@@ -223,7 +223,7 @@ class PlatformKeysTest : public PlatformKeysTestBase {
 };
 
 class TestSelectDelegate
-    : public chromeos::PlatformKeysService::SelectDelegate {
+    : public chromeos::ExtensionPlatformKeysService::SelectDelegate {
  public:
   // On each Select call, selects the next entry in |certs_to_select| from back
   // to front. Once the first entry is reached, that one will be selected
@@ -332,7 +332,7 @@ IN_PROC_BROWSER_TEST_P(UnmanagedPlatformKeysTest, Basic) {
   certs.push_back(client_cert2_);
   certs.push_back(client_cert1_);
 
-  GetPlatformKeysService()->SetSelectDelegate(
+  GetExtensionPlatformKeysService()->SetSelectDelegate(
       std::make_unique<TestSelectDelegate>(certs));
 
   ASSERT_TRUE(RunExtensionTest("basicTests")) << message_;
@@ -348,7 +348,7 @@ IN_PROC_BROWSER_TEST_P(UnmanagedPlatformKeysTest, Permissions) {
   net::CertificateList certs;
   certs.push_back(client_cert1_);
 
-  GetPlatformKeysService()->SetSelectDelegate(
+  GetExtensionPlatformKeysService()->SetSelectDelegate(
       std::make_unique<TestSelectDelegate>(certs));
 
   ASSERT_TRUE(RunExtensionTest("permissionTests")) << message_;
@@ -379,7 +379,7 @@ IN_PROC_BROWSER_TEST_P(ManagedWithoutPermissionPlatformKeysTest,
                        UserPermissionsBlocked) {
   // To verify that the user is not prompted for any certificate selection,
   // set up a delegate that fails on any invocation.
-  GetPlatformKeysService()->SetSelectDelegate(
+  GetExtensionPlatformKeysService()->SetSelectDelegate(
       std::make_unique<TestSelectDelegate>(net::CertificateList()));
 
   ASSERT_TRUE(RunExtensionTest("managedProfile")) << message_;
@@ -397,7 +397,7 @@ IN_PROC_BROWSER_TEST_P(ManagedWithoutPermissionPlatformKeysTest,
 
   // To verify that the user is not prompted for any certificate selection,
   // set up a delegate that fails on any invocation.
-  GetPlatformKeysService()->SetSelectDelegate(
+  GetExtensionPlatformKeysService()->SetSelectDelegate(
       std::make_unique<TestSelectDelegate>(net::CertificateList()));
 
   ASSERT_TRUE(RunExtensionTest("corporateKeyWithoutPermissionTests"))
@@ -432,7 +432,7 @@ IN_PROC_BROWSER_TEST_P(ManagedWithPermissionPlatformKeysTest,
   net::CertificateList certs;
   certs.push_back(client_cert1_);
 
-  GetPlatformKeysService()->SetSelectDelegate(
+  GetExtensionPlatformKeysService()->SetSelectDelegate(
       std::make_unique<TestSelectDelegate>(certs));
 
   ASSERT_TRUE(RunExtensionTest("corporateKeyWithPermissionTests")) << message_;
@@ -456,7 +456,7 @@ IN_PROC_BROWSER_TEST_P(ManagedWithPermissionPlatformKeysTest,
   if (user_status() == UserStatus::MANAGED_AFFILIATED_DOMAIN)
     certs.push_back(nullptr);
 
-  GetPlatformKeysService()->SetSelectDelegate(
+  GetExtensionPlatformKeysService()->SetSelectDelegate(
       std::make_unique<TestSelectDelegate>(certs));
 
   ASSERT_TRUE(RunExtensionTest("policyDoesGrantAccessToNonCorporateKey"))