Move the code in libcros' chromeos_speech_synthesis.cc into Chrome

chrome/browser/chromeos/accessibility_util.cc

 // Copyright (c) 2011 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_util.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/speech_synthesis_library.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/browser/chromeos/dbus/speech_synthesizer_client.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 126 matching lines @@
 
 void ToggleAccessibility(WebUI* login_web_ui) {
   bool accessibility_enabled = g_browser_process &&
       g_browser_process->local_state()->GetBoolean(
           prefs::kAccessibilityEnabled);
   accessibility_enabled = !accessibility_enabled;
   EnableAccessibility(accessibility_enabled, login_web_ui);
 };
 
 void 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);
+  if (queue || !interruptible) {
+    std::string props = "";
+    props.append("enqueue=");
+    props.append(queue ? "1;" : "0;");
+    props.append("interruptible=");
+    props.append(interruptible ? "1;" : "0;");
+    chromeos::DBusThreadManager::Get()->speech_synthesizer_client()->
+        SetSpeakProperties(props);
   }
+  chromeos::DBusThreadManager::Get()->speech_synthesizer_client()->
+      Speak(speak_str);
 }
 
 
 }  // namespace accessibility
 }  // namespace chromeos