| Index: chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
|
| index 3be5289aa322a5199632f7f05c6f6aae5077b1b3..397288e401b53346421ba53db691fb9d9ba474db 100644
|
| --- a/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
|
| +++ b/chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc
|
| @@ -55,36 +55,35 @@ class SystemUse24HourClockPolicyTest
|
| }
|
|
|
| static base::HourClockType TestGetPrimarySystemTrayTimeHourType() {
|
| - const ash::internal::TrayDate* tray_date = ash::Shell::GetInstance()->
|
| - GetPrimarySystemTray()->
|
| - GetTrayDateForTesting();
|
| - const ash::internal::tray::TimeView* time_tray =
|
| - tray_date->GetTimeTrayForTesting();
|
| + const ash::TrayDate* tray_date = ash::Shell::GetInstance()
|
| + ->GetPrimarySystemTray()
|
| + ->GetTrayDateForTesting();
|
| + const ash::tray::TimeView* time_tray = tray_date->GetTimeTrayForTesting();
|
|
|
| return time_tray->GetHourTypeForTesting();
|
| }
|
|
|
| static bool TestPrimarySystemTrayHasDateDefaultView() {
|
| - const ash::internal::TrayDate* tray_date = ash::Shell::GetInstance()->
|
| - GetPrimarySystemTray()->
|
| - GetTrayDateForTesting();
|
| - const ash::internal::DateDefaultView* date_default_view =
|
| + const ash::TrayDate* tray_date = ash::Shell::GetInstance()
|
| + ->GetPrimarySystemTray()
|
| + ->GetTrayDateForTesting();
|
| + const ash::DateDefaultView* date_default_view =
|
| tray_date->GetDefaultViewForTesting();
|
| return (date_default_view != NULL);
|
| }
|
|
|
| static void TestPrimarySystemTrayCreateDefaultView() {
|
| - ash::internal::TrayDate* tray_date = ash::Shell::GetInstance()->
|
| - GetPrimarySystemTray()->
|
| - GetTrayDateForTesting();
|
| + ash::TrayDate* tray_date = ash::Shell::GetInstance()
|
| + ->GetPrimarySystemTray()
|
| + ->GetTrayDateForTesting();
|
| tray_date->CreateDefaultViewForTesting(ash::user::LOGGED_IN_NONE);
|
| }
|
|
|
| static base::HourClockType TestGetPrimarySystemTrayDateHourType() {
|
| - const ash::internal::TrayDate* tray_date = ash::Shell::GetInstance()->
|
| - GetPrimarySystemTray()->
|
| - GetTrayDateForTesting();
|
| - const ash::internal::DateDefaultView* date_default_view =
|
| + const ash::TrayDate* tray_date = ash::Shell::GetInstance()
|
| + ->GetPrimarySystemTray()
|
| + ->GetTrayDateForTesting();
|
| + const ash::DateDefaultView* date_default_view =
|
| tray_date->GetDefaultViewForTesting();
|
|
|
| return date_default_view->GetDateView()->GetHourTypeForTesting();
|
|
|