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

chrome/browser/search/hotword_service_unittest.cc

Index: chrome/browser/search/hotword_service_unittest.cc
diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc
index 25f4aa368172ba093cbe6fc0743a7fb65b69209e..e78e2e783bfe7520183b6e077db3961b6775eaf4 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));
 
-// Disabled due to http://crbug.com/503963.
-TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedDisabledFieldTrial) {
+TEST_P(HotwordServiceTest, IsHotwordAllowedDisabledFieldTrial) {
+#if defined(ENABLE_HOTWORDING)
   TestingProfile::Builder profile_builder;
   scoped_ptr<TestingProfile> profile = profile_builder.Build();
 
@@ -194,8 +194,8 @@ TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedDisabledFieldTrial) {
 #endif
 }
 
-// Disabled due to http://crbug.com/503963.
-TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedInvalidFieldTrial) {
+TEST_P(HotwordServiceTest, IsHotwordAllowedInvalidFieldTrial) {
+#if defined(ENABLE_HOTWORDING)
   TestingProfile::Builder profile_builder;
   scoped_ptr<TestingProfile> profile = profile_builder.Build();
 
@@ -219,17 +219,11 @@ TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedInvalidFieldTrial) {
 #endif
 }
 
-// Disabled due to http://crbug.com/503963.
-TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) {
+TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
+#if defined(ENABLE_HOTWORDING)
   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 =
@@ -242,26 +236,22 @@ TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) {
 
   // Now with valid locales it should be fine.
   SetApplicationLocale(static_cast<Profile*>(profile.get()), "en");
-  EXPECT_EQ(hotwording_enabled,
-            HotwordServiceFactory::IsHotwordAllowed(profile.get()));
+  EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get()));
   SetApplicationLocale(static_cast<Profile*>(profile.get()), "en-US");
-  EXPECT_EQ(hotwording_enabled,
-            HotwordServiceFactory::IsHotwordAllowed(profile.get()));
+  EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get()));
   SetApplicationLocale(static_cast<Profile*>(profile.get()), "en_us");
-  EXPECT_EQ(hotwording_enabled,
-            HotwordServiceFactory::IsHotwordAllowed(profile.get()));
+  EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get()));
   SetApplicationLocale(static_cast<Profile*>(profile.get()), "de_DE");
-  EXPECT_EQ(hotwording_enabled,
-            HotwordServiceFactory::IsHotwordAllowed(profile.get()));
+  EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get()));
   SetApplicationLocale(static_cast<Profile*>(profile.get()), "fr_fr");
-  EXPECT_EQ(hotwording_enabled,
-            HotwordServiceFactory::IsHotwordAllowed(profile.get()));
+  EXPECT_TRUE(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) {
@@ -318,6 +308,7 @@ TEST_P(HotwordServiceTest, PreviousLanguageSetOnInstall) {
 }
 
 TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
+#if defined(ENABLE_HOTWORDING)
   InitializeEmptyExtensionService();
   service_->Init();
 
@@ -359,12 +350,7 @@ 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());
@@ -390,14 +376,10 @@ 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) {