Commit bc1eaa02 authored by James Cook's avatar James Cook Committed by Commit Bot

Skip ChromeVoxPanel creation under --mash

We already disable ChromeVox while running chrome --mash. Skipping the
panel creation inside AccessibilityManager allows more browser_tests to
run under --mash, including a bunch of tests that don't need or exercise
ChromeVox. This improves our test coverage of login and policy under
mash and doesn't make our runtime behavior any worse.

Bug: 628655
Test: browser_tests --mash
Change-Id: I634adbe5712be802f02148ff4c631e2110a963f4
Reviewed-on: https://chromium-review.googlesource.com/884837Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#531761}
parent 09234c50
......@@ -1438,7 +1438,8 @@ void AccessibilityManager::PostLoadChromeVox() {
event_router->DispatchEventWithLazyListener(
extension_misc::kChromeVoxExtensionId, std::move(event));
if (!chromevox_panel_) {
// TODO(mash): Support ChromeVoxPanel. http://crbug.com/628655
if (!chromevox_panel_ && chromeos::GetAshConfig() != ash::Config::MASH) {
chromevox_panel_ = new ChromeVoxPanel(
profile_,
session_manager::SessionManager::Get()->IsUserSessionBlocked());
......@@ -1480,6 +1481,10 @@ void AccessibilityManager::PostSwitchChromeVoxProfile() {
}
void AccessibilityManager::ReloadChromeVoxPanel() {
// TODO(mash): Support ChromeVoxPanel. http://crbug.com/628655
if (chromeos::GetAshConfig() == ash::Config::MASH)
return;
if (chromevox_panel_) {
chromevox_panel_->Close();
chromevox_panel_ = nullptr;
......
......@@ -12,15 +12,15 @@
-InitiallyRestored/AcceleratorCommandsPlatformAppFullscreenBrowserTest.*
# ChromeVoxPanel directly calls into ash to set panel height.
-AccessibilityFeatureaApiTestInstantiatePermission/AccessibilityFeaturesApiTest.*
# http://crbug.com/628655
-AccessibilityFeatureaApiTestInstantiatePermission/AccessibilityFeaturesApiTest.Set*
-AccessibilityManagerTest.*
-ChromeOSInfoPrivateTest.*
-PolicyPrefsTest.*
-PolicyProvidedTrustRootsPublicSessionTest.*
-PolicyTest.*
-ChromeOSInfoPrivateTest.TestGetAndSet
-PolicyTest.ScreenMagnifierTypeFull
-PolicyTest.ScreenMagnifierTypeNone
-PolicyTest.UnifiedDesktopEnabledByDefault
-UserTypeInstantiation/AccessibilityManagerUserTypeTest.*
-VolumeControllerSoundsTest.*
-WizardControllerTest.*
-WizardControllerTest.*ChromeVox
# Login constructs ash::FocusRingController and KeyboardDrivenOobeKeyHandler,
# both of which use ash::Shell.
......@@ -164,7 +164,8 @@
# desktop_window_tree_host_mus.cc(796) Check failed: !window->GetRootWindow() || this->window() == window->GetRootWindow().
-LoginFeedbackTest.*
# Missing magnification manager and ChromeVoxPanel crashes.
# Missing magnification manager and also RefCounted check failed:
# CalledOnValidSequence() from SchedulerWorkerDelegate::OnMainExit
-LoginScreenDefaultPolicyInSessionBrowsertest.*
-LoginScreenDefaultPolicyLoginScreenBrowsertest.*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment