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

Unified Diff: chrome/browser/chromeos/ownership/owner_settings_service.h

Issue 516243002: Instantiation of OwnerKeyUtil is delegated to OwnerSettingsServiceFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes. Created 6 years, 3 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/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().

Powered by Google App Engine
This is Rietveld 408576698