chromeos: Introduce ash::SystemTrayTestApi

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/login_status.h"
 #include "ash/shell.h"
 #include "ash/system/date/date_view.h"
 #include "ash/system/date/system_info_default_view.h"
 #include "ash/system/date/tray_system_info.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_test_api.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"
@@ skipping 45 matching lines @@
     RefreshDevicePolicy();
     run_loop.Run();
   }
 
   static bool SystemClockShouldUse24Hour() {
     return g_browser_process->platform_part()
         ->GetSystemClock()
         ->ShouldUse24HourClock();
   }
 
+  static ash::TraySystemInfo* GetTraySystemInfo() {
+    return ash::SystemTrayTestApi(ash::Shell::Get()->GetPrimarySystemTray())
+        .tray_system_info();
+  }
+
   static base::HourClockType TestGetPrimarySystemTrayTimeHourType() {
-    const ash::TraySystemInfo* tray_system_info =
-        ash::Shell::Get()
-            ->GetPrimarySystemTray()
-            ->GetTraySystemInfoForTesting();
+    const ash::TraySystemInfo* tray_system_info = GetTraySystemInfo();
     const ash::tray::TimeView* time_tray =
         tray_system_info->GetTimeTrayForTesting();
 
     return time_tray->GetHourTypeForTesting();
   }
 
   static bool TestPrimarySystemTrayHasDateDefaultView() {
-    const ash::TraySystemInfo* tray_system_info =
-        ash::Shell::Get()
-            ->GetPrimarySystemTray()
-            ->GetTraySystemInfoForTesting();
+    const ash::TraySystemInfo* tray_system_info = GetTraySystemInfo();
     const ash::SystemInfoDefaultView* system_info_default_view =
         tray_system_info->GetDefaultViewForTesting();
     return system_info_default_view != nullptr;
   }
 
   static void TestPrimarySystemTrayCreateDefaultView() {
-    ash::TraySystemInfo* tray_system_info = ash::Shell::Get()
-                                                ->GetPrimarySystemTray()
-                                                ->GetTraySystemInfoForTesting();
+    ash::TraySystemInfo* tray_system_info = GetTraySystemInfo();
     tray_system_info->CreateDefaultViewForTesting(
         ash::LoginStatus::NOT_LOGGED_IN);
   }
 
   static base::HourClockType TestGetPrimarySystemTrayDateHourType() {
-    const ash::TraySystemInfo* tray_system_info =
-        ash::Shell::Get()
-            ->GetPrimarySystemTray()
-            ->GetTraySystemInfoForTesting();
+    const ash::TraySystemInfo* tray_system_info = GetTraySystemInfo();
     const ash::SystemInfoDefaultView* system_info_default_view =
         tray_system_info->GetDefaultViewForTesting();
 
     return system_info_default_view->GetDateView()->GetHourTypeForTesting();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SystemUse24HourClockPolicyTest);
 };
 
@@ skipping 55 matching lines @@
   EXPECT_TRUE(CrosSettings::Get()->GetBoolean(kSystemUse24HourClock,
                                               &system_use_24hour_clock));
   EXPECT_FALSE(system_use_24hour_clock);
   EXPECT_FALSE(SystemClockShouldUse24Hour());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayTimeHourType());
   EXPECT_TRUE(TestPrimarySystemTrayHasDateDefaultView());
   EXPECT_EQ(base::k12HourClock, TestGetPrimarySystemTrayDateHourType());
 }
 
 }  // namespace chromeos