Use mojo SystemTray interfaces for both mash and classic ash

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 46b3cbd86ca8da8d086d9a5853646a6f0e93c291..f49da6b3750b3b09c719fa8181e7a61eea9be61c 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -185,7 +185,6 @@ void OnAcceptMultiprofilesIntro(bool no_show_again) {
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : user_profile_(NULL),
-      clock_type_(base::GetHourClockType()),
       search_key_mapped_to_(input_method::kSearchKey),
       screen_locked_(false),
       have_session_start_time_(false),
@@ -236,10 +235,6 @@ void SystemTrayDelegateChromeOS::Initialize() {
   input_method::InputMethodManager::Get()->AddImeMenuObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
 
-  g_browser_process->platform_part()->GetSystemClock()->AddObserver(this);
-
-  OnSystemClockChanged(g_browser_process->platform_part()->GetSystemClock());
-
   device::BluetoothAdapterFactory::GetAdapter(
       base::Bind(&SystemTrayDelegateChromeOS::InitializeOnAdapterReady,
                  weak_ptr_factory_.GetWeakPtr()));
@@ -293,7 +288,6 @@ SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
-  g_browser_process->platform_part()->GetSystemClock()->RemoveObserver(this);
   DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
   input_method::InputMethodManager::Get()->RemoveObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
@@ -403,10 +397,6 @@ void SystemTrayDelegateChromeOS::GetSystemUpdateInfo(
   GetUpdateInfo(UpgradeDetector::GetInstance(), info);
 }
 
-base::HourClockType SystemTrayDelegateChromeOS::GetHourClockType() const {
-  return clock_type_;
-}
-
 void SystemTrayDelegateChromeOS::ShowSettings() {
   SystemTrayCommon::ShowSettings();
 }
@@ -417,10 +407,6 @@ bool SystemTrayDelegateChromeOS::ShouldShowSettings() {
          !wm_shell->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
-void SystemTrayDelegateChromeOS::ShowDateSettings() {
-  SystemTrayCommon::ShowDateSettings();
-}
-
 void SystemTrayDelegateChromeOS::ShowSetTimeDialog() {
   // TODO(mash): Refactor out GetNativeWindow and move to SystemTrayCommon.
   SetTimeDialog::ShowDialog(GetNativeWindow());
@@ -914,19 +900,6 @@ bool SystemTrayDelegateChromeOS::UnsetProfile(Profile* profile) {
   return true;
 }
 
-bool SystemTrayDelegateChromeOS::GetShouldUse24HourClockForTesting() const {
-  return g_browser_process->platform_part()
-      ->GetSystemClock()
-      ->ShouldUse24HourClock();
-}
-
-void SystemTrayDelegateChromeOS::OnSystemClockChanged(
-    system::SystemClock* system_clock) {
-  const bool use_24_hour_clock = system_clock->ShouldUse24HourClock();
-  clock_type_ = use_24_hour_clock ? base::k24HourClock : base::k12HourClock;
-  GetSystemTrayNotifier()->NotifyDateFormatChanged();
-}
-
 void SystemTrayDelegateChromeOS::UpdateShowLogoutButtonInTray() {
   GetSystemTrayNotifier()->NotifyShowLoginButtonChanged(
       user_pref_registrar_->prefs()->GetBoolean(