Don't autostart Chromevox in tests when a braille display is connected.

chrome/browser/chromeos/accessibility/accessibility_manager.cc

Index: chrome/browser/chromeos/accessibility/accessibility_manager.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index e52e34989e9111ddc21b2f908baf4332d4bb18d2..7bc7f15c32412e59f946fd3e62390692d89f6ee5 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -14,6 +14,7 @@
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
+#include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
@@ -34,6 +35,7 @@
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/ui/accessibility_focus_ring_controller.h"
+#include "chrome/browser/extensions/api/braille_display_private/stub_braille_controller.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/tab_helper.h"
@@ -58,6 +60,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
+#include "content/public/common/content_switches.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ -78,6 +81,7 @@ using content::RenderViewHost;
 using extensions::api::braille_display_private::BrailleController;
 using extensions::api::braille_display_private::DisplayState;
 using extensions::api::braille_display_private::KeyEvent;
+using extensions::api::braille_display_private::StubBrailleController;
 
 namespace chromeos {
 
@@ -88,9 +92,14 @@ static chromeos::AccessibilityManager* g_accessibility_manager = NULL;
 static BrailleController* g_braille_controller_for_test = NULL;
 
 BrailleController* GetBrailleController() {
-  return g_braille_controller_for_test
-      ? g_braille_controller_for_test
-      : BrailleController::GetInstance();
+  if (g_braille_controller_for_test)
+    return g_braille_controller_for_test;
+  // Don't use the real braille controller for tests to avoid automatically
+  // starting ChromeVox which confuses some tests.
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kTestType))

[dmazzoni, 2015/09/25 17:20:59]

Does this only work when the test is run in a subprocess? What if the test
target is run with --single-process so that the test is launched in the same
process as the test runner? I wonder if there's some other way to determine this
is part of a test.

+    return StubBrailleController::GetInstance();
+  return BrailleController::GetInstance();
 }
 
 base::FilePath GetChromeVoxPath() {