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

Unified Diff: chrome/browser/chromeos/settings/session_manager_operation_unittest.cc

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/settings/session_manager_operation_unittest.cc
diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
index 86568f5ec80031ab50bf8c5a228c91edaa64c8da..7c5271d79dee6698a71418850ca26e8a377e949a 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
@@ -39,19 +39,19 @@ class SessionManagerOperationTest : public testing::Test {
: ui_thread_(content::BrowserThread::UI, &message_loop_),
file_thread_(content::BrowserThread::FILE, &message_loop_),
owner_key_util_(new ownership::MockOwnerKeyUtil()),
- validated_(false) {}
+ validated_(false) {
+ OwnerSettingsServiceFactory::GetInstance()->SetOwnerKeyUtilForTesting(
+ owner_key_util_);
+ }
virtual void SetUp() OVERRIDE {
policy_.payload().mutable_pinned_apps()->add_app_id("fake-app");
policy_.Build();
profile_.reset(new TestingProfile());
- OwnerSettingsService::SetOwnerKeyUtilForTesting(owner_key_util_);
service_ = OwnerSettingsServiceFactory::GetForProfile(profile_.get());
}
- void TearDown() { OwnerSettingsService::SetOwnerKeyUtilForTesting(NULL); }
-
MOCK_METHOD2(OnOperationCompleted,
void(SessionManagerOperation*, DeviceSettingsService::Status));

Powered by Google App Engine
This is Rietveld 408576698