chromeos: Introduce ash::SystemTrayTestApi

chrome/browser/ui/ash/system_tray_delegate_chromeos_browsertest_chromeos.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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <string>
 
 #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/macros.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/test/test_utils.h"
 
 namespace chromeos {
 
 namespace {
 
 // Because policy is not needed this test it is better to use e-mails that
 // are definitely not enterprise. This lets us to avoid faking of policy fetch
 // procedure.
 const char kUser1[] = "user1@gmail.com";
 const char kUser2[] = "user2@gmail.com";
 
+ash::TraySystemInfo* GetTraySystemInfo() {
+  return ash::SystemTrayTestApi(ash::Shell::Get()->GetPrimarySystemTray())
+      .tray_system_info();
+}
+
 base::HourClockType GetHourType() {
-  const ash::TraySystemInfo* tray_system_info =
-      ash::Shell::Get()->GetPrimarySystemTray()->GetTraySystemInfoForTesting();
   const ash::SystemInfoDefaultView* system_info_default_view =
-      tray_system_info->GetDefaultViewForTesting();
-
+      GetTraySystemInfo()->GetDefaultViewForTesting();
   return system_info_default_view->GetDateView()->GetHourTypeForTesting();
 }
 
 void CreateDefaultView() {
-  ash::TraySystemInfo* tray_system_info =
-      ash::Shell::Get()->GetPrimarySystemTray()->GetTraySystemInfoForTesting();
-  tray_system_info->CreateDefaultViewForTesting(
+  GetTraySystemInfo()->CreateDefaultViewForTesting(
       ash::LoginStatus::NOT_LOGGED_IN);
 }
 
 }  // namespace
 
 class SystemTrayDelegateChromeOSTest : public LoginManagerTest {
  protected:
   SystemTrayDelegateChromeOSTest()
       : LoginManagerTest(false /* should_launch_browser */),
         account_id1_(AccountId::FromUserEmail(kUser1)),
@@ skipping 40 matching lines @@
   EXPECT_EQ(base::k12HourClock, GetHourType());
 
   user_manager::UserManager::Get()->SwitchActiveUser(account_id1_);
   // Allow clock setting to be sent to ash over mojo.
   content::RunAllPendingInMessageLoop();
   CreateDefaultView();
   EXPECT_EQ(base::k24HourClock, GetHourType());
 }
 
 }  // namespace chromeos