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

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 40 matching lines @@
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/login_wizard.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/user_flow.h"
 #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"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/set_time_dialog.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/ui/choose_mobile_network_dialog.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
@@ skipping 940 matching lines @@
   user_pref->GetValue()->GetAsBoolean(&use_24_hour_clock);
   return use_24_hour_clock;
 }
 
 void SystemTrayDelegateChromeOS::UpdateClockType() {
   const bool use_24_hour_clock = ShouldUse24HourClock();
   clock_type_ = use_24_hour_clock ? base::k24HourClock : base::k12HourClock;
   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()) {
+    Profile* const profile = ProfileManager::GetActiveUserProfile();

[bartfab (slow), 2015/04/10 08:38:14]

ProfileManager::GetActiveUserProfile() is dangerous (it will return a "suitable"
profile, which may not be the profile you expect) and is documented as "avoid
using it at all cost." Please retrieve the current user from UserManager and
then get the profile for that user.

[Ivan Podogov, 2015/04/10 09:50:53]

OK, it was changed from that some iterations ago because of another comment. :)

+    OwnerSettingsServiceChromeOS* const service =
+        OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile);
+    service->SetBoolean(kSystemUse24HourClock, use_24_hour_clock);
+  }
 }
 
 void SystemTrayDelegateChromeOS::UpdateShowLogoutButtonInTray() {
   GetSystemTrayNotifier()->NotifyShowLoginButtonChanged(
       user_pref_registrar_->prefs()->GetBoolean(
           prefs::kShowLogoutButtonInTray));
 }
 
 void SystemTrayDelegateChromeOS::UpdateLogoutDialogDuration() {
   const int duration_ms =
@@ skipping 80 matching lines @@
   // It apparently sometimes takes a while after login before the current user
   // is recognized as the owner. Make sure that the system-wide clock setting
   // is updated when the recognition eventually happens
   // (http://crbug.com/278601).
   //
   // Note that it isn't safe to blindly call UpdateClockType() from this
   // method, as LoggedInStateChanged() is also called before the logged-in
   // 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());
+    Profile* const profile = ProfileManager::GetActiveUserProfile();

[bartfab (slow), 2015/04/10 08:38:14]

As above, please do not use ProfileManager::GetActiveUserProfile().

[Ivan Podogov, 2015/04/10 09:50:53]

Done.

+    OwnerSettingsServiceChromeOS* const service =
+        OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(profile);
+    service->SetBoolean(kSystemUse24HourClock, ShouldUse24HourClock());
   }
 }
 
 // Overridden from SessionManagerClient::Observer.
 void SystemTrayDelegateChromeOS::ScreenIsLocked() {
   screen_locked_ = true;
   ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
 }
 
 void SystemTrayDelegateChromeOS::ScreenIsUnlocked() {
@@ skipping 264 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos