Fix up HotwordServiceTest on Chrome-branded builds.

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 dd27eeb941729c467a84b77676c32a5c5e12ee0a..c1571fbd7cc02e31d4be6fbd0639b93965a10ee7 100644
--- a/chrome/browser/search/hotword_service_unittest.cc
+++ b/chrome/browser/search/hotword_service_unittest.cc
@@ -158,7 +158,8 @@ INSTANTIATE_TEST_CASE_P(HotwordServiceTests,
                         ::testing::Values(
                             extension_misc::kHotwordSharedModuleId));
 
-TEST_P(HotwordServiceTest, IsHotwordAllowedLocale) {
+// Disabled due to http://crbug.com/503963.
+TEST_P(HotwordServiceTest, DISABLED_IsHotwordAllowedLocale) {
   TestingProfile::Builder profile_builder;
   scoped_ptr<TestingProfile> profile = profile_builder.Build();
 
@@ -300,7 +301,8 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
 #if defined(ENABLE_HOTWORDING)
   EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
 #else
-  EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile()));
+  // Disabled due to http://crbug.com/503963.
+  // EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile()));
 #endif
 
   // Different but valid locale so expect uninstall.
@@ -330,7 +332,8 @@ TEST_P(HotwordServiceTest, UninstallReinstallTriggeredCorrectly) {
 #if defined(ENABLE_HOTWORDING)
   EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile()));
 #else
-  EXPECT_FALSE(HotwordServiceFactory::IsHotwordAllowed(profile()));
+  // 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