From 8ddce0c98690d84895edcb8a57c0cc6dec30c19d Mon Sep 17 00:00:00 2001 From: "rlp@chromium.org" Date: Tue, 8 Apr 2014 23:47:52 +0000 Subject: [Hotword] Remove extra languages because the feature was bumped. BUG=361240 Review URL: https://codereview.chromium.org/228803003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262557 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/search/hotword_service.cc | 8 +------- chrome/browser/search/hotword_service_unittest.cc | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc index 6fac3ae..b2db1de 100644 --- a/chrome/browser/search/hotword_service.cc +++ b/chrome/browser/search/hotword_service.cc @@ -26,13 +26,7 @@ const int kMaxTimesToShowOptInPopup = 10; // Allowed languages for hotwording. static const char* kSupportedLocales[] = { "en", - "en_us", - "en_gb", - "en_ca", - "en_au", - "fr_fr", - "de_de", - "ru_ru" + "en_us" }; // Enum describing the state of the hotword preference. diff --git a/chrome/browser/search/hotword_service_unittest.cc b/chrome/browser/search/hotword_service_unittest.cc index 5da13fe..03b2a5a 100644 --- a/chrome/browser/search/hotword_service_unittest.cc +++ b/chrome/browser/search/hotword_service_unittest.cc @@ -145,10 +145,6 @@ TEST_F(HotwordServiceTest, IsHotwordAllowedLocale) { EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); SetApplicationLocale(static_cast(profile.get()), "en_us"); EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); - SetApplicationLocale(static_cast(profile.get()), "de_DE"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); - SetApplicationLocale(static_cast(profile.get()), "fr_fr"); - EXPECT_TRUE(HotwordServiceFactory::IsHotwordAllowed(profile.get())); // Test that incognito even with a valid locale and valid field trial // still returns false. -- cgit v1.1