Fix AccessibilityModeTest.* on Win 8

content/browser/accessibility/accessibility_mode_helper_unittest.cc

Index: content/browser/accessibility/accessibility_mode_helper_unittest.cc
diff --git a/content/browser/accessibility/accessibility_mode_helper_unittest.cc b/content/browser/accessibility/accessibility_mode_helper_unittest.cc
index 73388a19e9f04aaa320e5d1fe9f0d670cf7c8a43..4b3d3fa3e243e024e38a142edef4f4d93bec6b79 100644
--- a/content/browser/accessibility/accessibility_mode_helper_unittest.cc
+++ b/content/browser/accessibility/accessibility_mode_helper_unittest.cc
@@ -6,9 +6,6 @@
 #include "content/common/view_message_enums.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
 
 namespace content {
 
@@ -19,22 +16,14 @@ TEST(AccessibilityModeHelperTest, TestNoOpRemove) {
 }
 
 TEST(AccessibilityModeHelperTest, TestRemoveSelf) {
-  AccessibilityMode kOffMode = AccessibilityModeOff;
-#if defined(OS_WIN)
-  // Always preserve AccessibilityModeEditableTextOnly on Windows 8,
-  // see RemoveAccessibilityModeFrom() implementation.
-  // Test won't pass if switches::kDisableRendererAccessibility is set.
-  if (base::win::GetVersion() >= base::win::VERSION_WIN8) {
-    kOffMode = AccessibilityModeEditableTextOnly;
-  }
-#endif  // defined(OS_WIN)
-
-  EXPECT_EQ(kOffMode,
+  AccessibilityMode kBaseMode = GetBaseAccessibilityMode();
+
+  EXPECT_EQ(kBaseMode,
             RemoveAccessibilityModeFrom(AccessibilityModeComplete,
                                         AccessibilityModeComplete));
 
   EXPECT_EQ(
-      kOffMode,
+      kBaseMode,
       RemoveAccessibilityModeFrom(AccessibilityModeEditableTextOnly,
                                   AccessibilityModeEditableTextOnly));
 }