Switch AccessibilityMode to be a bitmap

content/browser/accessibility/browser_accessibility_state_impl.cc

Index: content/browser/accessibility/browser_accessibility_state_impl.cc
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.cc b/content/browser/accessibility/browser_accessibility_state_impl.cc
index 3dee7d62b33d46a055500af0e3ee6dd9d87508b0..99a5c98b0e4c3bf9bf7066fc8b83853a020bc824 100644
--- a/content/browser/accessibility/browser_accessibility_state_impl.cc
+++ b/content/browser/accessibility/browser_accessibility_state_impl.cc
@@ -80,12 +80,12 @@ void BrowserAccessibilityStateImpl::OnScreenReaderDetected() {
           switches::kDisableRendererAccessibility)) {
     return;
   }
-  SetAccessibilityMode(AccessibilityModeComplete);
+  SetAccessibilityMode(accessibility_mode_ | AccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::EnableAccessibility() {
   // We may want to do something different with this later.
-  SetAccessibilityMode(AccessibilityModeComplete);
+  SetAccessibilityMode(accessibility_mode_ | AccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::DisableAccessibility() {
@@ -93,7 +93,8 @@ void BrowserAccessibilityStateImpl::DisableAccessibility() {
 }
 
 bool BrowserAccessibilityStateImpl::IsAccessibleBrowser() {
-  return (accessibility_mode_ == AccessibilityModeComplete);
+  return ((accessibility_mode_ & AccessibilityModeComplete) ==
+          AccessibilityModeComplete);
 }
 
 void BrowserAccessibilityStateImpl::AddHistogramCallback(
@@ -124,8 +125,7 @@ void BrowserAccessibilityStateImpl::UpdatePlatformSpecificHistograms() {
 }
 #endif
 
-void BrowserAccessibilityStateImpl::SetAccessibilityMode(
-    AccessibilityMode mode) {
+void BrowserAccessibilityStateImpl::SetAccessibilityMode(unsigned int mode) {
   if (accessibility_mode_ == mode)
     return;
   accessibility_mode_ = mode;