3 files changed, 0 insertions, 37 deletions
diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc
index 1e3cb7b..0c7fc08 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_util.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc
@@ -13,7 +13,6 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
-#include "base/metrics/histogram.h"
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
@@ -32,7 +31,6 @@
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
@@ -114,23 +112,6 @@ class ContentScriptLoader {
   std::queue<ExtensionResource> resources_;
 };
 
-void UpdateChromeOSAccessibilityHistograms() {
-  UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosSpokenFeedback",
-                        IsSpokenFeedbackEnabled());
-  UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosHighContrast",
-                        IsHighContrastEnabled());
-  UMA_HISTOGRAM_BOOLEAN("Accessibility.CrosVirtualKeyboard",
-                        IsVirtualKeyboardEnabled());
-  UMA_HISTOGRAM_ENUMERATION("Accessibility.CrosScreenMagnifier",
-                            GetMagnifierType(),
-                            3);
-}
-
-void Initialize() {
-  content::BrowserAccessibilityState::GetInstance()->AddHistogramCallback(
-      base::Bind(&UpdateChromeOSAccessibilityHistograms));
-}
-
 void EnableSpokenFeedback(bool enabled, content::WebUI* login_web_ui) {
   bool spoken_feedback_enabled = g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
@@ -267,16 +248,6 @@ bool IsHighContrastEnabled() {
   return high_contrast_enabled;
 }
 
-bool IsVirtualKeyboardEnabled() {
-  if (!g_browser_process) {
-    return false;
-  }
-  PrefService* prefs = g_browser_process->local_state();
-  bool virtual_keyboard_enabled = prefs &&
-      prefs->GetBoolean(prefs::kVirtualKeyboardEnabled);
-  return virtual_keyboard_enabled;
-}
-
 ash::MagnifierType GetMagnifierType() {
   if (!MagnificationManager::GetInstance())
     return ash::MAGNIFIER_OFF;
diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.h b/chrome/browser/chromeos/accessibility/accessibility_util.h
index fe99b33..c264dbc 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_util.h
+++ b/chrome/browser/chromeos/accessibility/accessibility_util.h
@@ -18,9 +18,6 @@ class WebUI;
 namespace chromeos {
 namespace accessibility {
 
-// Do any accessibility initialization that should happen once on startup.
-void Initialize();
-
 // Enables or disables spoken feedback. Enabling spoken feedback installs the
 // ChromeVox component extension.  If this is being called in a login/oobe
 // login screen, pass the WebUI object in login_web_ui so that ChromeVox
@@ -49,9 +46,6 @@ bool IsSpokenFeedbackEnabled();
 // Returns true if High Contrast is enabled, or false if not.
 bool IsHighContrastEnabled();
 
-// Returns true if the Virtual Keyboard is enabled, or false if not.
-bool IsVirtualKeyboardEnabled();
-
 // Returns the current state of the screen magnifier.
 ash::MagnifierType GetMagnifierType();
 
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index fcbddc3e..db458ad 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -17,7 +17,6 @@
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
@@ -529,7 +528,6 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
   }
   magnification_manager_.reset(
       chromeos::MagnificationManager::CreateInstance());
-  chromeos::accessibility::Initialize();
 
   primary_display_switch_observer_.reset(
       new PrimaryDisplaySwitchObserver());