Move core pieces of speech from chrome to content.

TBR=satish
Review URL: http://codereview.chromium.org/6591024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76165 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 80 insertions, 79 deletions

diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 3cd278a..f993d0f 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -42,8 +42,6 @@
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
-#include "chrome/browser/speech/speech_input_dispatcher_host.h"
-#include "chrome/browser/speech/speech_input_manager.h"
 #include "chrome/browser/spellcheck_host.h"
 #include "chrome/browser/spellcheck_message_filter.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ -89,6 +87,8 @@
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
 #include "content/browser/renderer_host/socket_stream_dispatcher_host.h"
+#include "content/browser/speech/speech_input_dispatcher_host.h"
+#include "content/browser/speech/speech_input_manager.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/browser/speech/speech_input_manager.cc b/chrome/browser/speech/speech_input_manager.cc
index 7a07543..626bf4f 100644
--- a/chrome/browser/speech/speech_input_manager.cc
+++ b/chrome/browser/speech/speech_input_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/speech_input_manager.h"
+#include "content/browser/speech/speech_input_manager.h"
 
 #include <map>
 #include <string>
@@ -14,14 +14,14 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_thread.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/speech/speech_input_bubble_controller.h"
-#include "chrome/browser/speech/speech_recognizer.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/speech/speech_recognizer.h"
 #include "grit/generated_resources.h"
 #include "media/audio/audio_manager.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1e30aec..cf9d6b2 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -35,14 +35,12 @@
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/expat/expat.gyp:expat',
-        '../third_party/flac/flac.gyp:libflac',
         '../third_party/hunspell/hunspell.gyp:hunspell',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libjingle/libjingle.gyp:libjingle',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/npapi/npapi.gyp:npapi',
-        '../third_party/speex/speex.gyp:libspeex',
         '../webkit/support/webkit_support.gyp:appcache',
         '../webkit/support/webkit_support.gyp:blob',
         '../webkit/support/webkit_support.gyp:database',
@@ -1852,14 +1850,6 @@
         'browser/sidebar/sidebar_container.h',
         'browser/sidebar/sidebar_manager.cc',
         'browser/sidebar/sidebar_manager.h',
-        'browser/speech/audio_encoder.cc',
-        'browser/speech/audio_encoder.h',
-        'browser/speech/endpointer/endpointer.cc',
-        'browser/speech/endpointer/endpointer.h',
-        'browser/speech/endpointer/energy_endpointer.cc',
-        'browser/speech/endpointer/energy_endpointer.h',
-        'browser/speech/endpointer/energy_endpointer_params.cc',
-        'browser/speech/endpointer/energy_endpointer_params.h',
         'browser/speech/speech_input_bubble.cc',
         'browser/speech/speech_input_bubble.h',
         'browser/speech/speech_input_bubble_controller.cc',
@@ -1867,14 +1857,7 @@
         'browser/speech/speech_input_bubble_gtk.cc',
         'browser/speech/speech_input_bubble_mac.mm',
         'browser/speech/speech_input_bubble_views.cc',
-        'browser/speech/speech_input_dispatcher_host.cc',
-        'browser/speech/speech_input_dispatcher_host.h',
         'browser/speech/speech_input_manager.cc',
-        'browser/speech/speech_input_manager.h',
-        'browser/speech/speech_recognition_request.cc',
-        'browser/speech/speech_recognition_request.h',
-        'browser/speech/speech_recognizer.cc',
-        'browser/speech/speech_recognizer.h',
         'browser/spellcheck_host.cc',
         'browser/spellcheck_host.h',
         'browser/spellcheck_message_filter.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3d10188..ec36bbf 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1478,10 +1478,7 @@
         'browser/sessions/session_backend_unittest.cc',
         'browser/sessions/session_service_unittest.cc',
         'browser/shell_integration_unittest.cc',
-        'browser/speech/endpointer/endpointer_unittest.cc',
         'browser/speech/speech_input_bubble_controller_unittest.cc',
-        'browser/speech/speech_recognition_request_unittest.cc',
-        'browser/speech/speech_recognizer_unittest.cc',
         'browser/spellchecker_platform_engine_unittest.cc',
         'browser/ssl/ssl_host_state_unittest.cc',
         'browser/status_icons/status_icon_unittest.cc',
@@ -1856,6 +1853,9 @@
         '../content/browser/renderer_host/resource_dispatcher_host_unittest.cc',
         '../content/browser/renderer_host/resource_queue_unittest.cc',
         '../content/browser/site_instance_unittest.cc',
+        '../content/browser/speech/endpointer/endpointer_unittest.cc',
+        '../content/browser/speech/speech_recognition_request_unittest.cc',
+        '../content/browser/speech/speech_recognizer_unittest.cc',
         '../content/browser/tab_contents/navigation_controller_unittest.cc',
         '../content/browser/tab_contents/navigation_entry_unittest.cc',
         '../content/browser/tab_contents/render_view_host_manager_unittest.cc',
@@ -2276,7 +2276,6 @@
         'browser/service/service_process_control_browsertest.cc',
         'browser/sessions/session_restore_browsertest.cc',
         'browser/sessions/tab_restore_service_browsertest.cc',
-        'browser/speech/speech_input_browsertest.cc',
         'browser/speech/speech_input_bubble_browsertest.cc',
         'browser/ssl/ssl_browser_tests.cc',
         'browser/task_manager/task_manager_browsertest.cc',
@@ -2326,6 +2325,7 @@
         '../content/browser/renderer_host/render_process_host_browsertest.cc',
         '../content/browser/renderer_host/render_view_host_browsertest.cc',
         '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
+        '../content/browser/speech/speech_input_browsertest.cc',
         '../content/browser/webui/web_ui_browsertest.cc',
         '../content/browser/webui/web_ui_browsertest.h',
         '../content/browser/webui/web_ui_handler_browsertest.cc',
diff --git a/content/browser/speech/OWNERS b/content/browser/speech/OWNERS
new file mode 100644
index 0000000..2ad1bbd
--- /dev/null
+++ b/content/browser/speech/OWNERS
@@ -0,0 +1 @@
+satish@chromium.org
diff --git a/chrome/browser/speech/audio_encoder.cc b/content/browser/speech/audio_encoder.cc
index fe48639..c24f45f 100644
--- a/chrome/browser/speech/audio_encoder.cc
+++ b/content/browser/speech/audio_encoder.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/audio_encoder.h"
+#include "content/browser/speech/audio_encoder.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
diff --git a/chrome/browser/speech/audio_encoder.h b/content/browser/speech/audio_encoder.h
index e17a413..c70bfd0 100644
--- a/chrome/browser/speech/audio_encoder.h
+++ b/content/browser/speech/audio_encoder.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_AUDIO_ENCODER_H_
-#define CHROME_BROWSER_SPEECH_AUDIO_ENCODER_H_
+#ifndef CONTENT_BROWSER_SPEECH_AUDIO_ENCODER_H_
+#define CONTENT_BROWSER_SPEECH_AUDIO_ENCODER_H_
 
 #include <list>
 #include <string>
@@ -56,4 +56,4 @@ class AudioEncoder {
 
 }  // namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_AUDIO_ENCODER_H_
+#endif  // CONTENT_BROWSER_SPEECH_AUDIO_ENCODER_H_
diff --git a/chrome/browser/speech/endpointer/endpointer.cc b/content/browser/speech/endpointer/endpointer.cc
index c30e1f2..69c79a6 100644
--- a/chrome/browser/speech/endpointer/endpointer.cc
+++ b/content/browser/speech/endpointer/endpointer.cc
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/endpointer/endpointer.h"
+#include "content/browser/speech/endpointer/endpointer.h"
+
 #include "base/time.h"
 
 using base::Time;
diff --git a/chrome/browser/speech/endpointer/endpointer.h b/content/browser/speech/endpointer/endpointer.h
index 8af6016..be4bd65 100644
--- a/chrome/browser/speech/endpointer/endpointer.h
+++ b/content/browser/speech/endpointer/endpointer.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_ENDPOINTER_ENDPOINTER_H_
-#define CHROME_BROWSER_SPEECH_ENDPOINTER_ENDPOINTER_H_
+#ifndef CONTENT_BROWSER_SPEECH_ENDPOINTER_ENDPOINTER_H_
+#define CONTENT_BROWSER_SPEECH_ENDPOINTER_ENDPOINTER_H_
 
 #include "base/basictypes.h"
-#include "chrome/browser/speech/endpointer/energy_endpointer.h"
+#include "content/browser/speech/endpointer/energy_endpointer.h"
 
 class EpStatus;
 
@@ -145,4 +145,4 @@ class Endpointer {
 
 }  // namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_ENDPOINTER_ENDPOINTER_H_
+#endif  // CONTENT_BROWSER_SPEECH_ENDPOINTER_ENDPOINTER_H_
diff --git a/chrome/browser/speech/endpointer/endpointer_unittest.cc b/content/browser/speech/endpointer/endpointer_unittest.cc
index bbdc572..3d1583e 100644
--- a/chrome/browser/speech/endpointer/endpointer_unittest.cc
+++ b/content/browser/speech/endpointer/endpointer_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/task.h"
-#include "chrome/browser/speech/endpointer/endpointer.h"
+#include "content/browser/speech/endpointer/endpointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/chrome/browser/speech/endpointer/energy_endpointer.cc b/content/browser/speech/endpointer/energy_endpointer.cc
index 85d4a29..c806aed 100644
--- a/chrome/browser/speech/endpointer/energy_endpointer.cc
+++ b/content/browser/speech/endpointer/energy_endpointer.cc
@@ -6,11 +6,11 @@
 // based of, see
 // https://wiki.corp.google.com/twiki/bin/view/Main/ChromeGoogleCodeXRef
 
-#include "chrome/browser/speech/endpointer/energy_endpointer.h"
+#include "content/browser/speech/endpointer/energy_endpointer.h"
 
-#include "base/logging.h"
 #include <math.h>
-#include <vector>
+
+#include "base/logging.h"
 
 namespace {
 
diff --git a/chrome/browser/speech/endpointer/energy_endpointer.h b/content/browser/speech/endpointer/energy_endpointer.h
index 20476e7..b10d8b7 100644
--- a/chrome/browser/speech/endpointer/energy_endpointer.h
+++ b/content/browser/speech/endpointer/energy_endpointer.h
@@ -34,13 +34,14 @@
 // accept. The false accepts can be ignored by setting
 // ep_contamination_rejection_period.
 
-#ifndef CHROME_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
-#define CHROME_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
+#ifndef CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
+#define CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
+
+#include <vector>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/speech/endpointer/energy_endpointer_params.h"
-#include <vector>
+#include "content/browser/speech/endpointer/energy_endpointer_params.h"
 
 namespace speech_input {
 
@@ -147,4 +148,4 @@ class EnergyEndpointer {
 
 }  // namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
+#endif  // CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_H_
diff --git a/chrome/browser/speech/endpointer/energy_endpointer_params.cc b/content/browser/speech/endpointer/energy_endpointer_params.cc
index 1ab044a..e110b24 100644
--- a/chrome/browser/speech/endpointer/energy_endpointer_params.cc
+++ b/content/browser/speech/endpointer/energy_endpointer_params.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/endpointer/energy_endpointer_params.h"
+#include "content/browser/speech/endpointer/energy_endpointer_params.h"
 
 namespace speech_input {
 
diff --git a/chrome/browser/speech/endpointer/energy_endpointer_params.h b/content/browser/speech/endpointer/energy_endpointer_params.h
index 86e44c9..5fd923d 100644
--- a/chrome/browser/speech/endpointer/energy_endpointer_params.h
+++ b/content/browser/speech/endpointer/energy_endpointer_params.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_PARAMS_H_
-#define CHROME_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_PARAMS_H_
+#ifndef CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_PARAMS_H_
+#define CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_PARAMS_H_
 
 #include "base/basictypes.h"
 
@@ -134,4 +134,4 @@ class EnergyEndpointerParams {
 
 }  //  namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_PARAMS_H_
+#endif  // CONTENT_BROWSER_SPEECH_ENDPOINTER_ENERGY_ENDPOINTER_PARAMS_H_
diff --git a/chrome/browser/speech/speech_input_browsertest.cc b/content/browser/speech/speech_input_browsertest.cc
index 0b8c904..c827f47 100644
--- a/chrome/browser/speech/speech_input_browsertest.cc
+++ b/content/browser/speech/speech_input_browsertest.cc
@@ -6,14 +6,14 @@
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/speech/speech_input_dispatcher_host.h"
-#include "chrome/browser/speech/speech_input_manager.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/speech/speech_input_dispatcher_host.h"
+#include "content/browser/speech/speech_input_manager.h"
+#include "content/browser/tab_contents/tab_contents.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 
 namespace speech_input {
diff --git a/chrome/browser/speech/speech_input_dispatcher_host.cc b/content/browser/speech/speech_input_dispatcher_host.cc
index dc993d5..84e2a95 100644
--- a/chrome/browser/speech/speech_input_dispatcher_host.cc
+++ b/content/browser/speech/speech_input_dispatcher_host.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/speech_input_dispatcher_host.h"
+#include "content/browser/speech/speech_input_dispatcher_host.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/common/speech_input_messages.h"
diff --git a/chrome/browser/speech/speech_input_dispatcher_host.h b/content/browser/speech/speech_input_dispatcher_host.h
index 23a1f23..abd93da 100644
--- a/chrome/browser/speech/speech_input_dispatcher_host.h
+++ b/content/browser/speech/speech_input_dispatcher_host.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
-#define CHROME_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
+#ifndef CONTENT_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
+#define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/browser_message_filter.h"
-#include "chrome/browser/speech/speech_input_manager.h"
+#include "content/browser/browser_message_filter.h"
+#include "content/browser/speech/speech_input_manager.h"
 
 struct SpeechInputHostMsg_StartRecognition_Params;
 
@@ -60,4 +60,4 @@ class SpeechInputDispatcherHost : public BrowserMessageFilter,
 
 }  // namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
+#endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_DISPATCHER_HOST_H_
diff --git a/chrome/browser/speech/speech_input_manager.h b/content/browser/speech/speech_input_manager.h
index 3646f4f..a6ba61f 100644
--- a/chrome/browser/speech/speech_input_manager.h
+++ b/content/browser/speech/speech_input_manager.h
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
-#define CHROME_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
+#ifndef CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
+#define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "chrome/common/speech_input_result.h"
-#include "ipc/ipc_message.h"
 #include "ui/gfx/rect.h"
 
 namespace speech_input {
@@ -75,4 +74,4 @@ typedef SpeechInputManager::Delegate SpeechInputManagerDelegate;
 
 }  // namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
+#endif  // CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
diff --git a/chrome/browser/speech/speech_recognition_request.cc b/content/browser/speech/speech_recognition_request.cc
index dc8dc27..d127437 100644
--- a/chrome/browser/speech/speech_recognition_request.cc
+++ b/content/browser/speech/speech_recognition_request.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/speech_recognition_request.h"
+#include "content/browser/speech/speech_recognition_request.h"
 
 #include <vector>
 
diff --git a/chrome/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index 9b022cf..3036d59 100644
--- a/chrome/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
-#define CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
+#ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
+#define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
 #pragma once
 
 #include <string>
+
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ -78,4 +79,4 @@ typedef SpeechRecognitionRequest::Delegate SpeechRecognitionRequestDelegate;
 
 }  // namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
+#endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNITION_REQUEST_H_
diff --git a/chrome/browser/speech/speech_recognition_request_unittest.cc b/content/browser/speech/speech_recognition_request_unittest.cc
index bd2a26e..e90f5cd 100644
--- a/chrome/browser/speech/speech_recognition_request_unittest.cc
+++ b/content/browser/speech/speech_recognition_request_unittest.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/speech/speech_recognition_request.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
+#include "content/browser/speech/speech_recognition_request.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/speech/speech_recognizer.cc b/content/browser/speech/speech_recognizer.cc
index 113600b..fdc1a4c 100644
--- a/chrome/browser/speech/speech_recognizer.cc
+++ b/content/browser/speech/speech_recognizer.cc
@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/speech/speech_recognizer.h"
+#include "content/browser/speech/speech_recognizer.h"
 
-#include "base/ref_counted.h"
-#include "base/scoped_ptr.h"
 #include "base/time.h"
-#include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/net/url_request_context_getter.h"
+#include "content/browser/browser_thread.h"
 
 using media::AudioInputController;
 using std::string;
diff --git a/chrome/browser/speech/speech_recognizer.h b/content/browser/speech/speech_recognizer.h
index 2570fba..a54a59d 100644
--- a/chrome/browser/speech/speech_recognizer.h
+++ b/content/browser/speech/speech_recognizer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
-#define CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
+#ifndef CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
+#define CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
 
 #include <list>
 #include <string>
@@ -11,9 +11,9 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/speech/audio_encoder.h"
-#include "chrome/browser/speech/endpointer/endpointer.h"
-#include "chrome/browser/speech/speech_recognition_request.h"
+#include "content/browser/speech/audio_encoder.h"
+#include "content/browser/speech/endpointer/endpointer.h"
+#include "content/browser/speech/speech_recognition_request.h"
 #include "media/audio/audio_input_controller.h"
 
 namespace speech_input {
@@ -148,4 +148,4 @@ typedef SpeechRecognizer::Delegate SpeechRecognizerDelegate;
 
 }  // namespace speech_input
 
-#endif  // CHROME_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
+#endif  // CONTENT_BROWSER_SPEECH_SPEECH_RECOGNIZER_H_
diff --git a/chrome/browser/speech/speech_recognizer_unittest.cc b/content/browser/speech/speech_recognizer_unittest.cc
index 855f35a..8365396 100644
--- a/chrome/browser/speech/speech_recognizer_unittest.cc
+++ b/content/browser/speech/speech_recognizer_unittest.cc
@@ -4,9 +4,9 @@
 
 #include <vector>
 
-#include "chrome/browser/browser_thread.h"
-#include "chrome/browser/speech/speech_recognizer.h"
 #include "chrome/common/net/test_url_fetcher_factory.h"
+#include "content/browser/browser_thread.h"
+#include "content/browser/speech/speech_recognizer.h"
 #include "media/audio/test_audio_input_controller_factory.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 3ca1baa..7d0c45b 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -14,6 +14,8 @@
         # Needed for dbg-shlib build.
         '../ppapi/ppapi.gyp:ppapi_proxy',
         '../skia/skia.gyp:skia',
+        '../third_party/flac/flac.gyp:libflac',
+        '../third_party/speex/speex.gyp:libspeex',
         # TabContents uses zoom constants and functions from WebKit::WebView.
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
         '../ui/ui.gyp:ui_base',
@@ -197,6 +199,21 @@
         'browser/renderer_host/x509_user_cert_resource_handler.h',
         'browser/site_instance.cc',
         'browser/site_instance.h',
+        'browser/speech/audio_encoder.cc',
+        'browser/speech/audio_encoder.h',
+        'browser/speech/endpointer/endpointer.cc',
+        'browser/speech/endpointer/endpointer.h',
+        'browser/speech/endpointer/energy_endpointer.cc',
+        'browser/speech/endpointer/energy_endpointer.h',
+        'browser/speech/endpointer/energy_endpointer_params.cc',
+        'browser/speech/endpointer/energy_endpointer_params.h',
+        'browser/speech/speech_input_dispatcher_host.cc',
+        'browser/speech/speech_input_dispatcher_host.h',
+        'browser/speech/speech_input_manager.h',
+        'browser/speech/speech_recognition_request.cc',
+        'browser/speech/speech_recognition_request.h',
+        'browser/speech/speech_recognizer.cc',
+        'browser/speech/speech_recognizer.h',
         'browser/tab_contents/constrained_window.h',
         'browser/tab_contents/infobar_delegate.cc',
         'browser/tab_contents/infobar_delegate.h',