chromeos: Introduce ash::SystemTrayTestApi

chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

 // Copyright (c) 2012 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/accessibility_types.h"
 #include "ash/login_status.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
+#include "ash/system/tray/system_tray_test_api.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/test/shell_test_api.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
@@ skipping 88 matching lines @@
                      policy::POLICY_SOURCE_CLOUD,
                      base::MakeUnique<base::Value>(value), nullptr);
       provider_.UpdateChromePolicy(policy_map);
       base::RunLoop().RunUntilIdle();
     } else {
       FAIL() << "Unknown test parameterization";
     }
   }
 
   ash::TrayAccessibility* tray() {
-    return ash::Shell::Get()
-        ->GetPrimarySystemTray()
-        ->GetTrayAccessibilityForTest();
+    return const_cast<ash::TrayAccessibility*>(
+        static_cast<const TrayAccessibilityTest*>(this)->tray());

[xiyuan, 2017/06/07 16:29:08]

nit: static_cast -> const_cast ?

[James Cook, 2017/06/07 16:35:53]

Done. Stack Overflow steered me wrong. :-)

   }
 
   const ash::TrayAccessibility* tray() const {
-    return ash::Shell::Get()
-        ->GetPrimarySystemTray()
-        ->GetTrayAccessibilityForTest();
+    return ash::SystemTrayTestApi(ash::Shell::Get()->GetPrimarySystemTray())
+        .tray_accessibility();
   }
 
   bool IsTrayIconVisible() const { return tray()->tray_icon_visible_; }
 
   views::View* CreateMenuItem() {
     return tray()->CreateDefaultView(GetLoginStatus());
   }
 
   void DestroyMenuItem() { return tray()->OnDefaultViewDestroyed(); }
 
@@ skipping 1569 matching lines @@
   EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu());
   CloseDetailMenu();
 }
 
 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
                         TrayAccessibilityTest,
                         testing::Values(PREF_SERVICE,
                                         POLICY));
 
 }  // namespace chromeos