Expand scope of enable_hotwording. (try 2)

chrome/common/features.gni

Index: chrome/common/features.gni
diff --git a/chrome/common/features.gni b/chrome/common/features.gni
index a74efab01e95ef0456cf40ddc40ee8e0d83180cf..8bb1fbe9b434cb8603aef03a2ef7df0bae30a855 100644
--- a/chrome/common/features.gni
+++ b/chrome/common/features.gni
@@ -5,39 +5,47 @@
 # This is the GN version of //chrome/chrome_features.gypi.
 # Please keep in sync!
 
+import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
 
+# Please keep features in alphabetical order.
 declare_args() {
-  # Google Now is disabled to prepare for its removal.
-  # http://crbug.com/539674
-  enable_google_now = false
-
   # Whether the Java UI is being used (Java infobars and popups, Java native
   # settings and first run experience, sign-in etc.).
   # Default to true if compiling for android, but allow this being overriden
   # through the environment.
   android_java_ui = is_android
 
-  # Use vulcanized HTML/CSS/JS resources to speed up WebUI (chrome://)
-  # pages. https://github.com/polymer/vulcanize
-  use_vulcanize = true
-
   # Enables support for background apps.
   enable_background = !is_ios && !is_android && !is_chromecast
 
   enable_one_click_signin =
       is_win || is_mac || (is_linux && !is_chromeos && !is_chromecast)
 
+  # Google Now is disabled to prepare for its removal.
+  # http://crbug.com/539674
+  enable_google_now = false
+
+  # 'Ok Google' hotwording is disabled by default. Set to true to enable. (This
+  # will download a closed-source NaCl module at startup.) Chrome-branded
+  # ChromeOS builds have this enabled by default.
+  enable_hotwording = is_chrome_branded && is_chromeos
+
   # Set to true to bundle all the mash related mojo services into chrome.
   # Specify --mash to chrome to have chrome start the mash environment.
   enable_package_mash_services = is_chromeos
 
   # Enables vr shell.
   enable_vr_shell = false
+
+  # Use vulcanized HTML/CSS/JS resources to speed up WebUI (chrome://)
+  # pages. https://github.com/polymer/vulcanize
+  use_vulcanize = true
 }
 
 chrome_grit_defines = [
   "enable_background=$enable_background",
   "enable_google_now=$enable_google_now",
+  "enable_hotwording=$enable_hotwording",

[Lei Zhang, 2016/08/04 01:02:07]

The <if expr="enable_hotwording"> in chrome/browser/browser_resources.grd never
evaluated to true previously, but grit happily generated all the resources
anyway. Once I fixed that, it exposed this problem.

   "use_vulcanize=$use_vulcanize",
 ]