| Index: chrome/browser/chromeos/ownership/owner_settings_service.h
|
| diff --git a/chrome/browser/chromeos/ownership/owner_settings_service.h b/chrome/browser/chromeos/ownership/owner_settings_service.h
|
| index a86c084673167805c5b7c9b87db58503d953ad91..3419d4ff1b3e7dbee4934d40695b9576f55c34be 100644
|
| --- a/chrome/browser/chromeos/ownership/owner_settings_service.h
|
| +++ b/chrome/browser/chromeos/ownership/owner_settings_service.h
|
| @@ -71,14 +71,11 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate,
|
|
|
| // 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 scoped_refptr<ownership::OwnerKeyUtil> MakeOwnerKeyUtil();
|
| -
|
| - static void SetOwnerKeyUtilForTesting(
|
| - const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
|
| + static void IsOwnerForSafeModeAsync(
|
| + const std::string& user_id,
|
| + const std::string& user_hash,
|
| + const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util,
|
| + const IsOwnerCallback& callback);
|
|
|
| static void SetDeviceSettingsServiceForTesting(
|
| DeviceSettingsService* device_settings_service);
|
| @@ -86,7 +83,9 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate,
|
| private:
|
| friend class OwnerSettingsServiceFactory;
|
|
|
| - explicit OwnerSettingsService(Profile* profile);
|
| + OwnerSettingsService(
|
| + Profile* profile,
|
| + const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
|
|
|
| // Reloads private key from profile's NSS slots. Responds via call
|
| // to OnPrivateKeyLoaded().
|
|
|