Remove code that enables renderer accessibility based on the SPI_GETSCREENREADER parameter.

Update chrome frame so that its test automation can still use renderer accessibility.

BUG=55902
TEST=none

Review URL: http://codereview.chromium.org/3383010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59899 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 12 insertions, 32 deletions

diff --git a/chrome/browser/accessibility_win_browsertest.cc b/chrome/browser/accessibility_win_browsertest.cc
index c1183fd..a9fbb15 100644
--- a/chrome/browser/accessibility_win_browsertest.cc
+++ b/chrome/browser/accessibility_win_browsertest.cc
@@ -26,47 +26,22 @@ namespace {
 
 class AccessibilityWinBrowserTest : public InProcessBrowserTest {
  public:
-  AccessibilityWinBrowserTest() : screenreader_running_(FALSE) {}
+  AccessibilityWinBrowserTest() {}
 
   // InProcessBrowserTest
   void SetUpInProcessBrowserTestFixture();
-  void TearDownInProcessBrowserTestFixture();
 
  protected:
   IAccessible* GetRendererAccessible();
   void ExecuteScript(wstring script);
-
- private:
-  BOOL screenreader_running_;
 };
 
 void AccessibilityWinBrowserTest::SetUpInProcessBrowserTestFixture() {
-  // This test assumes the windows system-wide SPI_SETSCREENREADER flag is
-  // cleared.
-  if (SystemParametersInfo(SPI_GETSCREENREADER, 0, &screenreader_running_, 0) &&
-      screenreader_running_) {
-    // Clear the SPI_SETSCREENREADER flag and notify active applications about
-    // the setting change.
-    ::SystemParametersInfo(SPI_SETSCREENREADER, FALSE, NULL, 0);
-    ::SendNotifyMessage(
-        HWND_BROADCAST, WM_SETTINGCHANGE, SPI_GETSCREENREADER, 0);
-  }
-
   // If the mouse happens to be on the document then it will have the unexpected
   // STATE_SYSTEM_HOTTRACKED state. Move it to a non-document location.
   ui_controls::SendMouseMove(0, 0);
 }
 
-void AccessibilityWinBrowserTest::TearDownInProcessBrowserTestFixture() {
-  if (screenreader_running_) {
-    // Restore the SPI_SETSCREENREADER flag and notify active applications about
-    // the setting change.
-    ::SystemParametersInfo(SPI_SETSCREENREADER, TRUE, NULL, 0);
-    ::SendNotifyMessage(
-        HWND_BROADCAST, WM_SETTINGCHANGE, SPI_GETSCREENREADER, 0);
-  }
-}
-
 class AccessibleChecker {
  public:
   AccessibleChecker(
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index f99e57d..cb757ab 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -100,6 +100,11 @@ RenderWidgetHost::RenderWidgetHost(RenderProcessHost* process,
   // Because the widget initializes as is_hidden_ == false,
   // tell the process host that we're alive.
   process_->WidgetRestored();
+
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kForceRendererAccessibility)) {
+    EnableRendererAccessibility();
+  }
 }
 
 RenderWidgetHost::~RenderWidgetHost() {
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index a88ae19..ad85f03 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -291,12 +291,6 @@ RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget)
   registrar_.Add(this,
                  NotificationType::RENDERER_PROCESS_TERMINATED,
                  NotificationService::AllSources());
-
-  BOOL screenreader_running = FALSE;
-  if (SystemParametersInfo(SPI_GETSCREENREADER, 0, &screenreader_running, 0) &&
-      screenreader_running) {
-    render_widget_host_->EnableRendererAccessibility();
-  }
 }
 
 RenderWidgetHostViewWin::~RenderWidgetHostViewWin() {
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index bd0c027..752736b 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -593,6 +593,11 @@ const char kFirstRun[]                      = "first-run";
 // current details.
 const char kForceFieldTestNameAndValue[]    = "force-fieldtest";
 
+// Force renderer accessibility to be on instead of enabling it on demand when
+// a screen reader is detected. The disable-renderer-accessibility switch
+// overrides this if present.
+const char kForceRendererAccessibility[]   = "force-renderer-accessibility";
+
 // Extra command line options for launching the GPU process (normally used
 // for debugging). Use like renderer-cmd-prefix.
 const char kGpuLauncher[]                   = "gpu-launcher";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index e7a74c8..6f61dfc 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -178,6 +178,7 @@ extern const char kFeedbackServer[];
 extern const char kFileDescriptorLimit[];
 extern const char kFirstRun[];
 extern const char kForceFieldTestNameAndValue[];
+extern const char kForceRendererAccessibility[];
 extern const char kGpuLauncher[];
 extern const char kGpuProcess[];
 extern const char kGpuStartupDialog[];