Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(354)

Unified Diff: content/test/BUILD.gn

Issue 2556883002: Remove enable_web_speech flag. (Closed)
Patch Set: Merge Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index b756300f1f66f63c41a9fe9fa47e093e5068817c..57fb16e95d0c7018d8784a612b202673db029524 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -824,6 +824,9 @@ test("content_browsertests") {
"${target_gen_dir}/content_browsertests_manifest/AndroidManifest.xml"
android_manifest_dep = ":content_browsertests_manifest"
use_default_launcher = false
+ } else {
+ # Non-Android.
+ sources += [ "../browser/speech/speech_recognition_browsertest.cc" ]
}
if (is_mac) {
@@ -886,10 +889,6 @@ test("content_browsertests") {
data_deps += [ "//ppapi:ppapi_tests" ]
}
- if (enable_web_speech) {
- sources += [ "../browser/speech/speech_recognition_browsertest.cc" ]
- }
-
if (!is_chrome_branded) {
# These tests depend on single process mode, which is disabled
# in official builds.
@@ -1583,15 +1582,6 @@ test("content_unittests") {
]
}
- if (enable_web_speech) {
- sources += [
- "../browser/speech/chunked_byte_buffer_unittest.cc",
- "../browser/speech/endpointer/endpointer_unittest.cc",
- "../browser/speech/speech_recognition_engine_unittest.cc",
- "../browser/speech/speech_recognizer_impl_unittest.cc",
- ]
- }
-
if (is_linux) {
if (use_dbus) {
deps += [ "//dbus:test_support" ]
@@ -1639,8 +1629,14 @@ test("content_unittests") {
]
defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
- }
- if (!is_android) {
+ } else {
+ # Non-Android.
+ sources += [
+ "../browser/speech/chunked_byte_buffer_unittest.cc",
+ "../browser/speech/endpointer/endpointer_unittest.cc",
+ "../browser/speech/speech_recognition_engine_unittest.cc",
+ "../browser/speech/speech_recognizer_impl_unittest.cc",
+ ]
deps += [ "//third_party/libvpx" ]
}
« no previous file with comments | « content/browser/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698