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

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

The compile-time flag "enable_hotwording" is now tied to
branding=Chrome (false by default unless making a Google Chrome build).

Note: Chromium will no longer download/install the Hotword Shared
Module, and will automatically remove the Hotword Shared Module on
startup if it was previously installed. To keep this functionality, add
"enable_hotwording=1" to GYP_DEFINES.

BUG=500922
Review URL: https://codereview.chromium.org/1200413003

Cr-Commit-Position: refs/heads/master@{#335874}
(cherry picked from commit 0366a5184a70b3eefb5fcef2c2e13721669f00d8)

Fix up HotwordServiceTest on Chrome-branded builds.

The ENABLE_HOTWORDING flag is not available in
hotword_service_unittest.cc, so all tests were assuming hotwording was
disabled (since r333548). This has been failing on Official builders
since r335874.

Since it's hard to resolve this in a simple way (we want to merge these
changes), just disabling the tests is the cleanest option for now.

BUG=503963
Review URL: https://codereview.chromium.org/1207163002

Cr-Commit-Position: refs/heads/master@{#336091}
(cherry picked from commit 8ef0bc35b1594ad013dc2ae1d6893e0091919271)

Resolved merge conflict: Disabled IsHotwordAllowedDisabledFieldTrial and
IsHotwordAllowedInvalidFieldTrial. These tests were deleted before the
upstream patch landed.

(Merge approval on http://crbug.com/500922#c69)

R=thakis@chromium.org
TBR=thakis@chromium.org

Committed: https://chromium.googlesource.com/chromium/src/+/86fb78f02492b2990307ed427c09670f2fff0d3b

Committed: https://chromium.googlesource.com/chromium/src/+/528e8f0f7f7c639cdaab3bad6afbfc72b7a92633

[Matt Giuca, 2015-06-29 01:55:09]

mgiuca@chromium.org changed reviewers:
+ thakis@chromium.org

[Nico, 2015-06-29 02:12:54]

The CL description is pretty confusing. I guess this is a merge request, yet it
doesn't say "merge" anywhere?

If it's just merging the stuff from last week to a branch, lgtm.

[Matt Giuca, 2015-06-29 02:43:58]

Committed patchset #1 (id:1) manually as
86fb78f02492b2990307ed427c09670f2fff0d3b (presubmit successful).

[Matt Giuca, 2015-06-29 02:48:19]

Sorry, landed before I saw this comment.

> The CL description is pretty confusing.

This is always what merges look like (see
http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/do...).
You know it's a merge because of which branch it lands in, not the CL
description.

This one is extra confusing because it merges two CLs in one; I wasn't sure how
to do that properly or even if it's allowed, but since the first CL broke the
build I decided to merge the fix in at the same time.

[falken, 2015-06-29 04:37:25]

On 2015/06/29 02:48:19, Matt Giuca wrote:
> Sorry, landed before I saw this comment.
> 
> > The CL description is pretty confusing.
> 
> This is always what merges look like (see
>
http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/do...).
> You know it's a merge because of which branch it lands in, not the CL
> description.
> 
> This one is extra confusing because it merges two CLs in one; I wasn't sure
how
> to do that properly or even if it's allowed, but since the first CL broke the
> build I decided to merge the fix in at the same time.

The beta bots look unhappy with this patch: go/betabuilders

[Matt Giuca, 2015-06-29 04:55:01]

Thanks for the heads up :( Looks like I goofed up a merge.

Reverted: https://codereview.chromium.org/1218763002/

[Matt Giuca, 2015-06-29 05:06:06]

Committed patchset #2 (id:20001) manually as
528e8f0f7f7c639cdaab3bad6afbfc72b7a92633 (presubmit successful).