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..4e7df5de93aa4f96c4894415c6425ed6356f62e0 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()->set_owner_key_util_for_testing( |
+ 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)); |