Get Win32K lockdown for renderers working again on Windows 8+.

content/browser/accessibility/accessibility_mode_helper.cc

Index: content/browser/accessibility/accessibility_mode_helper.cc
diff --git a/content/browser/accessibility/accessibility_mode_helper.cc b/content/browser/accessibility/accessibility_mode_helper.cc
index 6dc5791f1fde50c0174316045acf2e9f11b00349..9d0530091b255147ae63b652b76ef89fda728db9 100644
--- a/content/browser/accessibility/accessibility_mode_helper.cc
+++ b/content/browser/accessibility/accessibility_mode_helper.cc
@@ -5,12 +5,6 @@
 #include "base/logging.h"
 #include "content/browser/accessibility/accessibility_mode_helper.h"
 
-#if defined(OS_WIN)
-#include "base/command_line.h"
-#include "base/win/windows_version.h"
-#include "content/public/common/content_switches.h"
-#endif
-
 namespace content {
 
 namespace {
@@ -32,15 +26,6 @@ AccessibilityMode CastToAccessibilityMode(unsigned int int_mode) {
 
 AccessibilityMode GetBaseAccessibilityMode() {
   AccessibilityMode accessibility_mode = AccessibilityModeOff;
-#if defined(OS_WIN)
-  // On Windows 8, always enable accessibility for editable text controls
-  // so we can show the virtual keyboard when one is enabled.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableRendererAccessibility)) {
-    accessibility_mode = AccessibilityModeEditableTextOnly;
-  }
-#endif  // defined(OS_WIN)
   return accessibility_mode;
 }
 
@@ -53,18 +38,6 @@ AccessibilityMode RemoveAccessibilityModeFrom(
     AccessibilityMode from,
     AccessibilityMode mode_to_remove) {
   unsigned int new_mode = from ^ (mode_to_remove & from);
-#if defined(OS_WIN)
-  // On Windows 8, always enable accessibility for editable text controls
-  // so we can show the virtual keyboard when one is enabled.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableRendererAccessibility)) {
-    if ((from & AccessibilityModeEditableTextOnly) ==
-        AccessibilityModeEditableTextOnly)
-      new_mode |= AccessibilityModeEditableTextOnly;
-  }
-#endif  // defined(OS_WIN)
-
   return CastToAccessibilityMode(new_mode);
 }