Remove enable_web_speech flag.

This flag is not overridable from the build. Its definition is non-mobile. Now that iOS is no longer compiled using chrome or content, all web speech conditions become non-Android and this flag can be removed. BUG=671706 Review-Url: https://codereview.chromium.org/2556883002 Cr-Commit-Position: refs/heads/master@{#436860}
hylschwy · Dec 7, 2016 · 24746e5 · 24746e5
1 parent 20cc4e8
commit 24746e5
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 63 deletions.
diff --git a/build/config/features.gni b/build/config/features.gni
@@ -79,8 +79,6 @@ declare_args() {
 
 # Additional dependent variables -----------------------------------------------
 
-enable_web_speech = !is_android && !is_ios
-
 enable_task_manager = !is_ios && !is_android
 
 enable_themes = !is_android && !is_ios

diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
@@ -1288,7 +1288,7 @@ test("browser_tests") {
     ]
 
     enable_multidex = true
-  } else {
+  } else {  # Not Android.
     sources += [
       # The list of sources which is only used by chrome browser tests on
       # desktop platforms.
@@ -1697,6 +1697,11 @@ test("browser_tests") {
       "../browser/sessions/session_restore_browsertest_chromeos.cc",
       "../browser/sessions/tab_restore_browsertest.cc",
       "../browser/site_details_browsertest.cc",
+
+      # If this list is used on Android in the future, these browser/speech/*
+      # files will probably not be applicable.
+      "../browser/speech/extension_api/tts_extension_apitest.cc",
+      "../browser/speech/speech_recognition_browsertest.cc",
       "../browser/spellchecker/spellcheck_service_browsertest.cc",
       "../browser/ssl/captive_portal_blocking_page_browsertest.cc",
       "../browser/ssl/cert_verifier_browser_test.cc",
@@ -2371,12 +2376,6 @@ test("browser_tests") {
             [ "../browser/ui/views/ime/input_ime_apitest_nonchromeos.cc" ]
       }
     }
-    if (enable_web_speech) {
-      sources += [
-        "../browser/speech/extension_api/tts_extension_apitest.cc",
-        "../browser/speech/speech_recognition_browsertest.cc",
-      ]
-    }
     if (safe_browsing_mode == 1) {
       sources += [
         "../browser/safe_browsing/permission_reporter_browsertest.cc",
@@ -3608,6 +3607,8 @@ test("unit_tests") {
       # GCMDriverAndroid is not yet implemented.
       "../browser/services/gcm/gcm_profile_service_unittest.cc",
       "../browser/sessions/persistent_tab_restore_service_unittest.cc",
+      "../browser/speech/extension_api/extension_manifests_tts_unittest.cc",
+      "../browser/speech/tts_controller_unittest.cc",
       "../browser/sync/sessions/sessions_sync_manager_unittest.cc",
       "../browser/sync/sync_ui_util_unittest.cc",  # Sync setup uses native ui.
       "../browser/translate/translate_manager_render_view_host_unittest.cc",
@@ -4198,12 +4199,6 @@ test("unit_tests") {
       "../browser/printing/cloud_print/privet_url_fetcher_unittest.cc",
     ]
   }
-  if (enable_web_speech) {
-    sources += [
-      "../browser/speech/extension_api/extension_manifests_tts_unittest.cc",
-      "../browser/speech/tts_controller_unittest.cc",
-    ]
-  }
 
   if (safe_browsing_mode > 0) {
     sources += [

diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
@@ -1297,27 +1297,11 @@ source_set("browser") {
     "shared_worker/worker_storage_partition.h",
     "site_instance_impl.cc",
     "site_instance_impl.h",
-    "speech/audio_buffer.cc",
-    "speech/audio_buffer.h",
-    "speech/audio_encoder.cc",
-    "speech/audio_encoder.h",
-    "speech/chunked_byte_buffer.cc",
-    "speech/chunked_byte_buffer.h",
-    "speech/endpointer/endpointer.cc",
-    "speech/endpointer/endpointer.h",
-    "speech/endpointer/energy_endpointer.cc",
-    "speech/endpointer/energy_endpointer.h",
-    "speech/endpointer/energy_endpointer_params.cc",
-    "speech/endpointer/energy_endpointer_params.h",
     "speech/speech_recognition_dispatcher_host.cc",
     "speech/speech_recognition_dispatcher_host.h",
-    "speech/speech_recognition_engine.cc",
-    "speech/speech_recognition_engine.h",
     "speech/speech_recognition_manager_impl.cc",
     "speech/speech_recognition_manager_impl.h",
     "speech/speech_recognizer.h",
-    "speech/speech_recognizer_impl.cc",
-    "speech/speech_recognizer_impl.h",
     "speech/speech_recognizer_impl_android.cc",
     "speech/speech_recognizer_impl_android.h",
     "ssl/ssl_client_auth_handler.cc",
@@ -1768,8 +1752,22 @@ source_set("browser") {
       "media/session/audio_focus_manager.h",
       "tracing/tracing_ui.cc",
       "tracing/tracing_ui.h",
-
-      # Android skips most, but not all, of the speech code.
+    ]
+    deps -= [ "//device/battery" ]
+    deps += [
+      "//content/public/android:jni",
+      "//media",
+      "//media/capture/content/android",
+      "//media/capture/video/android",
+      "//mojo/android:libsystem_java",
+      "//ui/android",
+    ]
+    defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
+    libs += [ "jnigraphics" ]
+  } else {
+    # Not Android.
+    sources += [
+      # Most speech code is non-Android.
       "speech/audio_buffer.cc",
       "speech/audio_buffer.h",
       "speech/audio_encoder.cc",
@@ -1787,17 +1785,7 @@ source_set("browser") {
       "speech/speech_recognizer_impl.cc",
       "speech/speech_recognizer_impl.h",
     ]
-    deps -= [ "//device/battery" ]
-    deps += [
-      "//content/public/android:jni",
-      "//media",
-      "//media/capture/content/android",
-      "//media/capture/video/android",
-      "//mojo/android:libsystem_java",
-      "//ui/android",
-    ]
-    defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
-    libs += [ "jnigraphics" ]
+    deps += [ "//third_party/flac" ]
   }
 
   if (is_mac) {
@@ -1941,10 +1929,6 @@ source_set("browser") {
     deps += [ "//ui/compositor" ]
   }
 
-  if (enable_web_speech) {
-    deps += [ "//third_party/flac" ]
-  }
-
   if (is_linux && use_dbus) {
     deps += [ "//dbus" ]
   }

diff --git 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" ]
   }