Revert 170590

chrome/browser/chromeos/accessibility/accessibility_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 
 #include <queue>
 
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/magnifier/magnification_controller.h"
 #include "ash/magnifier/partial_magnification_controller.h"
 #include "ash/shell.h"
 #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"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api_controller.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #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"
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 61 matching lines @@
     }
     Run();
   }
 
   std::string extension_id_;
   int render_process_id_;
   int render_view_id_;
   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(
           prefs::kSpokenFeedbackEnabled);
   if (spoken_feedback_enabled == enabled) {
     DLOG(INFO) << "Spoken feedback is already " <<
         (enabled ? "enabled" : "disabled") << ".  Going to do nothing.";
     return;
   }
 
@@ skipping 116 matching lines @@
 bool IsHighContrastEnabled() {
   if (!g_browser_process) {
     return false;
   }
   PrefService* prefs = g_browser_process->local_state();
   bool high_contrast_enabled = prefs &&
       prefs->GetBoolean(prefs::kHighContrastEnabled);
   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;
   return MagnificationManager::GetInstance()->GetMagnifierType();
 }
 
 ash::MagnifierType MagnifierTypeFromName(const char type_name[]) {
   if (0 == strcmp(type_name, kScreenMagnifierFull))
     return ash::MAGNIFIER_FULL;
   else if (0 == strcmp(type_name, kScreenMagnifierPartial))
@@ skipping 18 matching lines @@
   if (IsSpokenFeedbackEnabled())
     Speak(utterance);
 }
 
 void ShowAccessibilityHelp(Browser* browser) {
   chrome::ShowSingletonTab(browser, GURL(chrome::kChromeAccessibilityHelpURL));
 }
 
 }  // namespace accessibility
 }  // namespace chromeos