Disable "Ok Google" hotwording in open source builds by default.

build/common.gypi

Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 9399c5d17afc3e1653eb003a77500c67e06ea284..84eb1fbe0231e23b8f42e53b94cdc71e2f773ee6 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -416,8 +416,10 @@
       # Web speech is enabled by default. Set to 0 to disable.
       'enable_web_speech%': 1,
 
-      # 'Ok Google' hotwording is enabled by default. Set to 0 to disable.
-      'enable_hotwording%': 1,
+      # 'Ok Google' hotwording is disabled by default in open source builds. Set
+      # to 1 to enable. (This will download a closed-source NaCl module at
+      # startup.) Chrome-branded builds have this enabled by default.
+      'enable_hotwording%': 0,
 
       # Notifications are compiled in by default. Set to 0 to disable.
       'notifications%' : 1,
@@ -836,6 +838,10 @@
           'enable_prod_wallet_service%': 1,
         }],
 
+        ['branding=="Chrome"', {

[Nico, 2015/06/24 01:46:30]

Isn't buildtype=Official a better check?

[Matt Giuca, 2015/06/24 01:59:47]

See Anand's previous comment. (I initially had buildtype==Official.)

From looking at other examples (e.g. bundling Flash), it looks like
branding==Chrome is the correct check for proprietary stuff. buildtype==Official
is about optimizations; branding controls both the iconography/titling, and the
inclusion of proprietary components.

+          'enable_hotwording%': 1,
+        }],
+
         ['OS=="android"', {
           'enable_webrtc%': 1,
         }],