Remove hotword installation code at compile time if hotwording disabled.

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 315c85ae0545e8803163d7ddb8d7c04b5689c5e6..16d513adfc19a75ee0ca334c9e916b21af014bf0 100644
--- a/chrome/browser/search/hotword_service_unittest.cc
+++ b/chrome/browser/search/hotword_service_unittest.cc
@@ -163,8 +163,7 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTests,
                         ::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();
 
@@ -306,8 +305,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
 #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.
@@ -337,8 +335,7 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
 #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