Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests.

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index f3ef877875ad19d3f3d2abdddeac815bf226d497..81534efa1f49be459a4493c87649fdd8b48a8420 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -58,6 +58,8 @@
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h"
@@ -1018,8 +1020,17 @@ void SystemTrayDelegateChromeOS::UpdateClockType() {
   GetSystemTrayNotifier()->NotifyDateFormatChanged();
   // This also works for enterprise-managed devices because they never have
   // local owner.
-  if (user_manager::UserManager::Get()->IsCurrentUserOwner())
-    CrosSettings::Get()->SetBoolean(kSystemUse24HourClock, use_24_hour_clock);
+  if (user_manager::UserManager::Get()->IsCurrentUserOwner()) {
+    user_manager::User* const user =
+        user_manager::UserManager::Get()->GetActiveUser();
+    DCHECK(user);

[bartfab (slow), 2015/04/22 15:14:58]

Nit: Here and below: Use CHECK(), not DCHECK(), as you will crash if you get a
|nullptr|.

[Ivan Podogov, 2015/04/22 15:16:40]

Done.

+    Profile* const profile = ProfileHelper::Get()->GetProfileByUser(user);
+    DCHECK(profile);
+    OwnerSettingsServiceChromeOS* const service =
+        OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile);
+    DCHECK(service);
+    service->SetBoolean(kSystemUse24HourClock, use_24_hour_clock);
+  }
 }
 
 void SystemTrayDelegateChromeOS::UpdateShowLogoutButtonInTray() {
@@ -1120,8 +1131,15 @@ void SystemTrayDelegateChromeOS::LoggedInStateChanged() {
   // user's profile has actually been loaded (http://crbug.com/317745). The
   // system tray's time format is updated at login via SetProfile().
   if (user_manager::UserManager::Get()->IsCurrentUserOwner()) {
-    CrosSettings::Get()->SetBoolean(kSystemUse24HourClock,
-                                    ShouldUse24HourClock());
+    user_manager::User* const user =
+        user_manager::UserManager::Get()->GetActiveUser();
+    DCHECK(user);

[bartfab (slow), 2015/04/22 15:12:32]

Nit: As above, use CHECK() throughout, not DCHECK().

[Ivan Podogov, 2015/04/22 15:16:40]

Done.

+    Profile* const profile = ProfileHelper::Get()->GetProfileByUser(user);
+    DCHECK(profile);
+    OwnerSettingsServiceChromeOS* const service =
+        OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile);
+    DCHECK(service);
+    service->SetBoolean(kSystemUse24HourClock, ShouldUse24HourClock());
   }
 }