Revert of Expand scope of enable_hotwording.

chrome/browser/extensions/BUILD.gn

Index: chrome/browser/extensions/BUILD.gn
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 24683ed4c41e32574d948d130818c10a7d9095b0..0000525f551df92f7f28ad73327064df6f87628e 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -4,7 +4,6 @@
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
-import("//chrome/common/features.gni")
 
 assert(enable_extensions)
 
@@ -109,6 +108,13 @@
     "//url",
   ]
 
+  if (enable_task_manager) {
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_task_manager_enabled_sources,
+            ".",
+            "//chrome")
+  }
+
   if (is_chromeos) {
     sources +=
         rebase_path(gypi_values.chrome_browser_extensions_chromeos_sources,
@@ -134,19 +140,31 @@
                     "//chrome")
   }
 
-  # chromeos uses its own global_shortcut_listener, _x11 is not necessary.
-  if (is_chromeos || !use_x11) {
-    sources -= [
-      "global_shortcut_listener_x11.cc",
-      "global_shortcut_listener_x11.h",
-    ]
-  }
-
-  if (is_chromeos && use_ozone) {
-    sources -= [ "global_shortcut_listener_chromeos.cc" ]
-  }
-  if (!use_ozone) {
-    sources -= [ "global_shortcut_listener_ozone.cc" ]
+  if (enable_service_discovery) {
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_service_discovery_sources,
+            ".",
+            "//chrome")
+  }
+
+  if (use_ash) {
+    sources += [
+      "api/tabs/ash_panel_contents.cc",
+      "api/tabs/ash_panel_contents.h",
+    ]
+    deps += [ "//ash" ]
+  }
+
+  if (use_aura) {
+    deps += [
+      "//ui/keyboard",
+      "//ui/keyboard:keyboard_with_content",
+      "//ui/keyboard:resources",
+    ]
+  }
+
+  if (toolkit_views) {
+    deps += [ "//ui/views" ]
   }
 
   if (is_linux) {
@@ -172,80 +190,11 @@
     }
   }
 
-  if (is_win || is_mac) {
-    deps += [ "//components/wifi" ]
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_networking_private_sources_winmac,
-            ".",
-            "//chrome")
-  }
-
-  if (is_win) {
-    deps += [
-      "//third_party/iaccessible2",
-      "//third_party/isimpledom",
-    ]
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_input_ime_linux_win_sources,
-            ".",
-            "//chrome")
-  } else if (use_aura && !is_chromeos) {
-    sources += [
-      "display_info_provider_aura.cc",
-      "display_info_provider_aura.h",
-    ]
-  }
-
-  if (enable_app_list) {
-    sources +=
-        rebase_path(gypi_values.chrome_browser_extensions_app_list_sources,
-                    ".",
-                    "//chrome")
-  }
-
-  if (enable_hotwording) {
-    defines += [ "ENABLE_HOTWORDING" ]
-  }
-
-  if (enable_service_discovery) {
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_service_discovery_sources,
-            ".",
-            "//chrome")
-  }
-
-  if (enable_task_manager) {
-    sources += rebase_path(
-            gypi_values.chrome_browser_extensions_task_manager_enabled_sources,
-            ".",
-            "//chrome")
-  }
-
   if (enable_webrtc) {
     sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
   } else {
     sources +=
         [ "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
-  }
-
-  if (toolkit_views) {
-    deps += [ "//ui/views" ]
-  }
-
-  if (use_ash) {
-    sources += [
-      "api/tabs/ash_panel_contents.cc",
-      "api/tabs/ash_panel_contents.h",
-    ]
-    deps += [ "//ash" ]
-  }
-
-  if (use_aura) {
-    deps += [
-      "//ui/keyboard",
-      "//ui/keyboard:keyboard_with_content",
-      "//ui/keyboard:resources",
-    ]
   }
 
   if (use_brlapi) {
@@ -256,4 +205,50 @@
   } else {
     sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
   }
+
+  # chromeos uses its own global_shortcut_listener, _x11 is not necessary.
+  if (is_chromeos || !use_x11) {
+    sources -= [
+      "global_shortcut_listener_x11.cc",
+      "global_shortcut_listener_x11.h",
+    ]
+  }
+
+  if (is_win || is_mac) {
+    deps += [ "//components/wifi" ]
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_networking_private_sources_winmac,
+            ".",
+            "//chrome")
+  }
+
+  if (is_win) {
+    deps += [
+      "//third_party/iaccessible2",
+      "//third_party/isimpledom",
+    ]
+    sources += rebase_path(
+            gypi_values.chrome_browser_extensions_input_ime_linux_win_sources,
+            ".",
+            "//chrome")
+  } else if (use_aura && !is_chromeos) {
+    sources += [
+      "display_info_provider_aura.cc",
+      "display_info_provider_aura.h",
+    ]
+  }
+
+  if (enable_app_list) {
+    sources +=
+        rebase_path(gypi_values.chrome_browser_extensions_app_list_sources,
+                    ".",
+                    "//chrome")
+  }
+
+  if (is_chromeos && use_ozone) {
+    sources -= [ "global_shortcut_listener_chromeos.cc" ]
+  }
+  if (!use_ozone) {
+    sources -= [ "global_shortcut_listener_ozone.cc" ]
+  }
 }