Remove usage of singleton software_slot_ in nss on ChromeOS

chrome/browser/chromeos/ownership/owner_settings_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 34 matching lines @@
       const AssembleAndSignPolicyCallback& callback) OVERRIDE;
 
   // NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // TPMTokenLoader::Observer:
   virtual void OnTPMTokenReady() OVERRIDE;
 
-  // Checks whether NSS slots with private key are mounted or
-  // not. Responds via |callback|.
-  static void IsPrivateKeyExistAsync(const IsOwnerCallback& callback);
+  // Checks if the user is the device owner, without the user profile having to
+  // been initialized. Should be used only if login state is in safe mode.
+  static void IsOwnerForSafeModeAsync(const std::string& user_id,
+                                      const std::string& user_hash,
+                                      const IsOwnerCallback& callback);
 
   static void SetOwnerKeyUtilForTesting(
       const scoped_refptr<OwnerKeyUtil>& owner_key_util);
 
   static void SetDeviceSettingsServiceForTesting(
       DeviceSettingsService* device_settings_service);
 
  private:
   friend class OwnerSettingsServiceFactory;
 
   explicit OwnerSettingsService(Profile* profile);
 
+  // Checks whether NSS slots with private key are mounted or
+  // not. Responds via |callback|.
+  static void IsPrivateKeyExistAsync(const IsOwnerCallback& callback);

[Ryan Sleevi, 2014/07/01 18:51:33]

If this is a static method, can't you really just move it into the .cc
definition? Why make it a static class member?

[tbarzic, 2014/07/01 23:55:03]

no valid reason; moved to .cc

+
   // Reloads private key from profile's NSS slots. Responds via call
   // to OnPrivateKeyLoaded().
   void ReloadPrivateKey();
 
   // Called when ReloadPrivateKey() completes it's work.
   void OnPrivateKeyLoaded(scoped_ptr<crypto::RSAPrivateKey> private_key);
 
   // Returns testing instance of OwnerKeyUtil when it's set, otherwise
   // returns |owner_key_util_|.
   scoped_refptr<OwnerKeyUtil> GetOwnerKeyUtil();
@@ skipping 23 matching lines @@
   base::ThreadChecker thread_checker_;
 
   base::WeakPtrFactory<OwnerSettingsService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_H_