mash: Move SystemTrayDelegate ownership to WmShell

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/wm_shell.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_default_view.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/user/login_status.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 44 matching lines @@
             kSystemUse24HourClock,
             base::MessageLoop::current()->QuitWhenIdleClosure());
 
     RefreshDevicePolicy();
     base::MessageLoop::current()->Run();
   }
 
   static bool GetSystemTrayDelegateShouldUse24HourClock() {
     chromeos::SystemTrayDelegateChromeOS* tray_delegate =
         static_cast<chromeos::SystemTrayDelegateChromeOS*>(
-            ash::Shell::GetInstance()->system_tray_delegate());
+            ash::WmShell::Get()->system_tray_delegate());
     return tray_delegate->GetShouldUse24HourClockForTesting();
   }
 
   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 87 matching lines @@
   EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                               &system_use_24hour_clock));
   EXPECT_FALSE(system_use_24hour_clock);
   EXPECT_FALSE(GetSystemTrayDelegateShouldUse24HourClock());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());
   EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());
 }
 
 }  // namespace chromeos