diff options
| -rw-r--r-- | build/common.gypi | 10 | ||||
| -rw-r--r-- | chrome/browser/BUILD.gn | 6 | ||||
| -rw-r--r-- | chrome/browser/search/hotword_service_unittest.cc | 46 |
3 files changed, 44 insertions, 18 deletions
diff --git a/build/common.gypi b/build/common.gypi index ddb075c..2f3f209 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -381,8 +381,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, @@ -813,6 +815,10 @@ ] }], + ['branding=="Chrome"', { + 'enable_hotwording%': 1, + }], + ['OS=="android"', { 'enable_webrtc%': 1, }], diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 6ccb079..8b7e0fe 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -19,8 +19,10 @@ if (is_desktop_linux) { } declare_args() { - # 'Ok Google' hotwording is enabled. - enable_hotwording = true + # 'Ok Google' hotwording is disabled by default in open source builds. Set to + # true to enable. (This will download a closed-source NaCl module at startup.) + # Chrome-branded builds have this enabled by default. + enable_hotwording = is_chrome_branded } about_credits_file = "$target_gen_dir/about_credits.html" diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc index e78e2e7..25f4aa3 100644 --- a/chrome/browser/search/hotword_service_unittest.cc +++ b/chrome/browser/search/hotword_service_unittest.cc @@ -157,8 +157,8 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTests, ::testing::Values( extension_misc::kHotwordSharedModuleId)); -TEST_P(HotwordServiceTest, IsHotwordAllowedDisabledFieldTrial) { -#if defined(ENABLE_HOTWORDING) +// Disabled due to http://crbug.com/503963. +TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedDisabledFieldTrial) { TestingProfile::Builder profile_builder; scoped_ptr<TestingProfile> profile = profile_builder.Build(); @@ -194,8 +194,8 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedDisabledFieldTrial) { #endif } -TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) { -#if defined(ENABLE_HOTWORDING) +// Disabled due to http://crbug.com/503963. +TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedInvalidFieldTrial) { TestingProfile::Builder profile_builder; scoped_ptr<TestingProfile> profile = profile_builder.Build(); @@ -219,11 +219,17 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) { #endif } -TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) { -#if defined(ENABLE_HOTWORDING) +// Disabled due to http://crbug.com/503963. +TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) { TestingProfile::Builder profile_builder; scoped_ptr<TestingProfile> profile = profile_builder.Build(); +#if defined(ENABLE_HOTWORDING) + bool hotwording_enabled = true; +#else + bool hotwording_enabled = false; +#endif + // Check that the service exists so that a NULL service be ruled out in // following tests. HotwordService* hotword_service = @@ -236,22 +242,26 @@ TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) { // Now with valid locales it should be fine. SetApplicationLocale(static_cast<Profile*>(profile.get()), "en"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); + EXPECT_EQ(hotwording_enabled, + HotwordServiceFactory::IsHotwordAllowed(profile.get())); SetApplicationLocale(static_cast<Profile*>(profile.get()), "en-US"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); + EXPECT_EQ(hotwording_enabled, + HotwordServiceFactory::IsHotwordAllowed(profile.get())); SetApplicationLocale(static_cast<Profile*>(profile.get()), "en_us"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); + EXPECT_EQ(hotwording_enabled, + HotwordServiceFactory::IsHotwordAllowed(profile.get())); SetApplicationLocale(static_cast<Profile*>(profile.get()), "de_DE"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); + EXPECT_EQ(hotwording_enabled, + HotwordServiceFactory::IsHotwordAllowed(profile.get())); SetApplicationLocale(static_cast<Profile*>(profile.get()), "fr_fr"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); + EXPECT_EQ(hotwording_enabled, + HotwordServiceFactory::IsHotwordAllowed(profile.get())); // Test that incognito even with a valid locale and valid field trial // still returns false. Profile* otr_profile = profile->GetOffTheRecordProfile(); SetApplicationLocale(otr_profile, "en"); EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(otr_profile)); -#endif // defined(ENABLE_HOTWORDING) } TEST_P(HotwordServiceTest, ShouldReinstallExtension) { @@ -308,7 +318,6 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) { } TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) { -#if defined(ENABLE_HOTWORDING) InitializeEmptyExtensionService(); service_->Init(); @@ -350,7 +359,12 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) { // Switch the locale to a valid but different one. SetApplicationLocale(profile(), "fr_fr"); +#if defined(ENABLE_HOTWORDING) EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile())); +#else + // Disabled due to http://crbug.com/503963. + // EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile())); +#endif // Different but valid locale so expect uninstall. EXPECT_TRUE(hotword_service->MaybeReinstallHotwordExtension()); @@ -376,10 +390,14 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) { // If the locale is set back to the last valid one, then an uninstall-install // shouldn't be needed. SetApplicationLocale(profile(), "fr_fr"); +#if defined(ENABLE_HOTWORDING) EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile())); +#else + // Disabled due to http://crbug.com/503963. + // EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile())); +#endif EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension()); EXPECT_EQ(1, hotword_service->uninstall_count()); // no change -#endif // defined(ENABLE_HOTWORDING) } TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) { |