Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / settings / device_settings_test_helper.cc

diff --git a/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index 24e5886..537c3bf 100644 (file)
--- a/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/src/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -113,6 +113,10 @@ void DeviceSettingsTestHelper::StartSession(const std::string& user_email) {}
 
 void DeviceSettingsTestHelper::StopSession() {}
 
+void DeviceSettingsTestHelper::NotifySupervisedUserCreationStarted() {}
+
+void DeviceSettingsTestHelper::NotifySupervisedUserCreationFinished() {}
+
 void DeviceSettingsTestHelper::StartDeviceWipe() {}
 
 void DeviceSettingsTestHelper::RequestLockScreen() {}
@@ -197,6 +201,8 @@ DeviceSettingsTestBase::DeviceSettingsTestBase()
     : user_manager_(new FakeUserManager()),
       user_manager_enabler_(user_manager_),
       owner_key_util_(new ownership::MockOwnerKeyUtil()) {
+  OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
+      &device_settings_service_);
   OwnerSettingsServiceChromeOSFactory::GetInstance()->SetOwnerKeyUtilForTesting(
       owner_key_util_);
 }
@@ -218,13 +224,11 @@ void DeviceSettingsTestBase::SetUp() {
   device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
   device_settings_service_.SetSessionManager(&device_settings_test_helper_,
                                              owner_key_util_);
-  OwnerSettingsServiceChromeOS::SetDeviceSettingsServiceForTesting(
-      &device_settings_service_);
   profile_.reset(new TestingProfile());
 }
 
 void DeviceSettingsTestBase::TearDown() {
-  OwnerSettingsServiceChromeOS::SetDeviceSettingsServiceForTesting(NULL);
+  OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(NULL);
   FlushDeviceSettings();
   device_settings_service_.UnsetSessionManager();
   DBusThreadManager::Shutdown();