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

chrome/browser/search/hotword_service_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/test/test_simple_task_runner.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 139 matching lines @@
 
   base::FieldTrialList field_trial_list_;
   std::string extension_id_;
 };
 
 INSTANTIATE_TEST_CASE_P(HotwordServiceTests,
                         HotwordServiceTest,
                         ::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();
 
   // Check that the service exists so that a NULL service be ruled out in
   // following tests.
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(profile.get());
   EXPECT_TRUE(hotword_service != NULL);
 
   // When the field trial is empty, it should be allowed.
@@ skipping 15 matching lines @@
   // still false.
   SetApplicationLocale(static_cast<Profile*>(profile.get()), "en");
   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile.get()));
 
   // Test that incognito returns false as well.
   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(
       profile->GetOffTheRecordProfile()));
 #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();
 
   // Check that the service exists so that a NULL service be ruled out in
   // following tests.
   HotwordService* hotword_service =
       HotwordServiceFactory::GetForProfile(profile.get());
   EXPECT_TRUE(hotword_service != NULL);
 
   // When the field trial is set, but not 'Disabled', it should be allowed.
   ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
      hotword_internal::kHotwordFieldTrialName, "foo"));
   std::string group = base::FieldTrialList::FindFullName(
       hotword_internal::kHotwordFieldTrialName);
   EXPECT_TRUE(group == "foo");
   EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get()));
 
   // Test that incognito returns false as well.
   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(
       profile->GetOffTheRecordProfile()));
 #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 =
       HotwordServiceFactory::GetForProfile(profile.get());
   EXPECT_TRUE(hotword_service != NULL);
 
   // Set the language to an invalid one.
   SetApplicationLocale(static_cast<Profile*>(profile.get()), "non-valid");
   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile.get()));
 
   // 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) {
   InitializeEmptyExtensionService();
 
   HotwordServiceFactory* hotword_service_factory =
       HotwordServiceFactory::GetInstance();
 
   MockHotwordService* hotword_service = static_cast<MockHotwordService*>(
       hotword_service_factory->SetTestingFactoryAndUse(
@@ skipping 36 matching lines @@
   SetApplicationLocale(profile(), "test_locale");
 
   hotword_service->InstallHotwordExtensionFromWebstore(1);
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_EQ("test_locale",
             profile()->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
 }
 
 TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
+#if defined(ENABLE_HOTWORDING)
   InitializeEmptyExtensionService();
   service_->Init();
 
   HotwordServiceFactory* hotword_service_factory =
       HotwordServiceFactory::GetInstance();
 
   MockHotwordService* hotword_service = static_cast<MockHotwordService*>(
       hotword_service_factory->SetTestingFactoryAndUse(
           profile(), BuildMockHotwordService));
   ASSERT_TRUE(hotword_service != NULL);
@@ skipping 21 matching lines @@
     EXPECT_EQ(1U, registry()->disabled_extensions().size());
     EXPECT_TRUE(registry()->disabled_extensions().Contains(extension_id_));
   }
 
   // The previous locale should be set but should match the current
   // locale. No reason to uninstall.
   EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
 
   // 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());
   EXPECT_EQ(1, hotword_service->uninstall_count());
   EXPECT_EQ("fr_fr",
             profile()->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
 
   if (extension_id_ == extension_misc::kHotwordSharedModuleId) {
     // Shared module is installed and enabled.
     EXPECT_TRUE(registry()->enabled_extensions().Contains(extension_id_));
   } else {
     // Verify the extension is installed. It's still disabled.
     EXPECT_TRUE(registry()->disabled_extensions().Contains(extension_id_));
   }
 
   // Switch the locale to an invalid one.
   SetApplicationLocale(profile(), "invalid");
   EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile()));
   EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
   EXPECT_EQ("fr_fr",
             profile()->GetPrefs()->GetString(prefs::kHotwordPreviousLanguage));
 
   // 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) {
   // Bypass test for old hotwording.
   if (extension_id_ != extension_misc::kHotwordSharedModuleId)
     return;
 
   // Turn on Always On
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalHotwordHardware);
@@ skipping 169 matching lines @@
   EXPECT_EQ(1, audio_history_handler->GetAudioHistoryCalls());
   // We expect the next check for audio history to be in the queue.
   EXPECT_EQ(base::TimeDelta::FromDays(1),
             test_task_runner->NextPendingTaskDelay());
   EXPECT_TRUE(test_task_runner->HasPendingTask());
   test_task_runner->RunPendingTasks();
   EXPECT_EQ(2, audio_history_handler->GetAudioHistoryCalls());
   EXPECT_TRUE(test_task_runner->HasPendingTask());
   test_task_runner->ClearPendingTasks();
 }