Use mojo SystemTray interfaces for both mash and classic ash

chrome/browser/chromeos/policy/device_system_use_24hour_clock_browsertest.cc

 // Copyright 2014 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 "ash/common/login_status.h"
 #include "ash/common/system/date/date_default_view.h"
 #include "ash/common/system/date/date_view.h"
+#include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/browser/chromeos/system/system_clock.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace em = enterprise_management;
 
 namespace chromeos {
 
 class SystemUse24HourClockPolicyTest
     : public policy::DevicePolicyCrosBrowserTest {
@@ skipping 25 matching lines @@
   void RefreshPolicyAndWaitDeviceSettingsUpdated() {
     base::RunLoop run_loop;
     std::unique_ptr<CrosSettings::ObserverSubscription> observer =
         CrosSettings::Get()->AddSettingsObserver(
             kSystemUse24HourClock, run_loop.QuitWhenIdleClosure());
 
     RefreshDevicePolicy();
     run_loop.Run();
   }
 
-  static bool GetSystemTrayDelegateShouldUse24HourClock() {
-    chromeos::SystemTrayDelegateChromeOS* tray_delegate =
-        static_cast<chromeos::SystemTrayDelegateChromeOS*>(
-            ash::WmShell::Get()->system_tray_delegate());
-    return tray_delegate->GetShouldUse24HourClockForTesting();
+  static bool SystemClockShouldUse24Hour() {
+    return g_browser_process->platform_part()
+        ->GetSystemClock()
+        ->ShouldUse24HourClock();
   }
 
   static base::HourClockType TestGetPrimarySystemTrayTimeHourType() {
     const ash::TrayDate* tray_date = ash::Shell::GetInstance()
                                          ->GetPrimarySystemTray()
                                          ->GetTrayDateForTesting();
     const ash::tray::TimeView* time_tray = tray_date->GetTimeTrayForTesting();
 
     return time_tray->GetHourTypeForTesting();
   }
@@ skipping 26 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemUse24HourClockPolicyTest);
 };
 
 IN_PROC_BROWSER_TEST_F(SystemUse24HourClockPolicyTest, CheckUnset) {
   bool system_use_24hour_clock;
   EXPECT_FALSE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                                &system_use_24hour_clock));
 
-  EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());
+  EXPECT_FALSE(SystemClockShouldUse24Hour());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());
   EXPECT_FALSE(TestPrimarySystemTrayHasDateDefaultView());
 
   TestPrimarySystemTrayCreateDefaultView();
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());
 }
 
 IN_PROC_BROWSER_TEST_F(SystemUse24HourClockPolicyTest, CheckTrue) {
   bool system_use_24hour_clock = true;
   EXPECT_FALSE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                                &system_use_24hour_clock));
   EXPECT_FALSE(TestPrimarySystemTrayHasDateDefaultView());
 
-  EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());
+  EXPECT_FALSE(SystemClockShouldUse24Hour());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());
   TestPrimarySystemTrayCreateDefaultView();
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());
 
   em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
   proto.mutable_use_24hour_clock()->set_use_24hour_clock(true);
   RefreshPolicyAndWaitDeviceSettingsUpdated();
 
   system_use_24hour_clock = false;
   EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                               &system_use_24hour_clock));
   EXPECT_TRUE(system_use_24hour_clock);
-  EXPECT_TRUE(GetSystemTrayDelegateShouldUse24HourClock());
+  EXPECT_TRUE(SystemClockShouldUse24Hour());
   EXPECT_EQ(base::k24HourClock, TestGetPrimarySystemTrayTimeHourType());
 
   EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());
   EXPECT_EQ(base::k24HourClock, TestGetPrimarySystemTrayDateHourType());
 }
 
 IN_PROC_BROWSER_TEST_F(SystemUse24HourClockPolicyTest, CheckFalse) {
   bool system_use_24hour_clock = true;
   EXPECT_FALSE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                                &system_use_24hour_clock));
   EXPECT_FALSE(TestPrimarySystemTrayHasDateDefaultView());
 
-  EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());
+  EXPECT_FALSE(SystemClockShouldUse24Hour());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());
   TestPrimarySystemTrayCreateDefaultView();
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());
 
   em::ChromeDeviceSettingsProto& proto(device_policy()->payload());
   proto.mutable_use_24hour_clock()->set_use_24hour_clock(false);
   RefreshPolicyAndWaitDeviceSettingsUpdated();
 
   system_use_24hour_clock = true;
   EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                               &system_use_24hour_clock));
   EXPECT_FALSE(system_use_24hour_clock);
-  EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());
+  EXPECT_FALSE(SystemClockShouldUse24Hour());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());
   EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());
 }
 
 }  // namespace chromeos