Remove hotword installation code at compile time if hotwording disabled.

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 "chrome/browser/search/hotword_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 145 matching lines @@
   }
 
   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_IsHotwordAllowedLocale) {
+TEST_P(HotwordServiceTest, 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
@@ skipping 121 matching lines @@
 
   // 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()));
+  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()));
+  EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile()));
 #endif
   EXPECT_FALSE(hotword_service->MaybeReinstallHotwordExtension());
   EXPECT_EQ(1, hotword_service->uninstall_count());  // no change
 }
 
 TEST_P(HotwordServiceTest, DisableAlwaysOnOnLanguageChange) {
   // Bypass test for old hotwording.
   if (extension_id_ != extension_misc::kHotwordSharedModuleId)
     return;
 
@@ skipping 172 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();
 }