Move Speak() in accessibility_utils, speak enable and disable strings when

chrome/browser/chromeos/login/wizard_accessibility_handler.cc

Index: chrome/browser/chromeos/login/wizard_accessibility_handler.cc
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
index a23453b6641be649605c67a12956410d408d54a9..2626a257d70066aadc83ebda1f6fbf0590fafd60 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
+++ b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc
@@ -11,6 +11,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/accessibility_events.h"
+#include "chrome/browser/chromeos/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"

[dmazzoni, 2011/08/29 22:30:03]

I think you can delete this, check for other includes that this file doesn't
need anymore.

[Zachary Kuznia, 2011/08/30 08:03:36]

Done.

 #include "chrome/browser/chromeos/cros/speech_synthesis_library.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
@@ -109,25 +110,7 @@ void WizardAccessibilityHandler::Observe(
   std::string description;
   EarconType earcon = NO_EARCON;
   DescribeAccessibilityEvent(type, control_info, &description, &earcon);
-  Speak(description.c_str(), false, true);
-}
-
-void WizardAccessibilityHandler::Speak(const char* speak_str,
-                                       bool queue,
-                                       bool interruptible) {
-  if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
-    if (queue || !interruptible) {
-      std::string props = "";
-      props.append("enqueue=");
-      props.append(queue ? "1;" : "0;");
-      props.append("interruptible=");
-      props.append(interruptible ? "1;" : "0;");
-      chromeos::CrosLibrary::Get()->GetSpeechSynthesisLibrary()->
-          SetSpeakProperties(props.c_str());
-    }
-    chromeos::CrosLibrary::Get()->GetSpeechSynthesisLibrary()->
-        Speak(speak_str);
-  }
+  accessibility::Speak(description.c_str(), false, true);
 }
 
 void WizardAccessibilityHandler::DescribeAccessibilityEvent(