diff options
| author | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 04:51:36 +0000 |
|---|---|---|
| committer | yosin@chromium.org <yosin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-27 04:51:36 +0000 |
| commit | c7fda591efcbce01ee41729fff7d9f91dbeabdad (patch) | |
| tree | 6b294e3cdc19a7adc5fc04a3220b7433e7c264a8 /webkit/user_agent | |
| parent | e7aa7b7ec477c1bb274a1d8fb653197ffce16847 (diff) | |
| download | chromium_src-c7fda591efcbce01ee41729fff7d9f91dbeabdad.zip chromium_src-c7fda591efcbce01ee41729fff7d9f91dbeabdad.tar.gz chromium_src-c7fda591efcbce01ee41729fff7d9f91dbeabdad.tar.bz2 | |
Yahoo Japan has made several changes for their sites. So, we don't need have UA spoofing for following sites:
- http://headlines.yahoo.co.jp/videonews/
- http://weather.yahoo.co.jp/weather/zoomradar/
- http://pokemon.kids.yahoo.co.jp
Related code review: https://chromiumcodereview.appspot.com/10093009
BUG=104426
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11308165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169571 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/user_agent')
| -rw-r--r-- | webkit/user_agent/user_agent.cc | 14 | ||||
| -rw-r--r-- | webkit/user_agent/user_agent_unittest.cc | 3 |
2 files changed, 1 insertions, 16 deletions
diff --git a/webkit/user_agent/user_agent.cc b/webkit/user_agent/user_agent.cc index 0efdb22..dea8df0 100644 --- a/webkit/user_agent/user_agent.cc +++ b/webkit/user_agent/user_agent.cc @@ -74,15 +74,6 @@ bool IsMicrosoftSiteThatNeedsSpoofingForSilverlight(const GURL& url) { } bool IsYahooSiteThatNeedsSpoofingForSilverlight(const GURL& url) { -#if defined(OS_MACOSX) || defined(OS_WIN) - // The following Yahoo! JAPAN pages erroneously judge that Silverlight does - // not support Chromium. Until the pages are fixed, spoof the UA. - // http://crbug.com/104426 - if (url.host() == "headlines.yahoo.co.jp" && - StartsWithASCII(url.path(), "/videonews/", true)) { - return true; - } -#endif #if defined(OS_MACOSX) if ((url.host() == "downloads.yahoo.co.jp" && StartsWithASCII(url.path(), "/docs/silverlight/", true)) || @@ -90,10 +81,7 @@ bool IsYahooSiteThatNeedsSpoofingForSilverlight(const GURL& url) { return true; } #elif defined(OS_WIN) - if ((url.host() == "weather.yahoo.co.jp" && - StartsWithASCII(url.path(), "/weather/zoomradar/", true)) || - url.host() == "promotion.shopping.yahoo.co.jp" || - url.host() == "pokemon.kids.yahoo.co.jp") { + if (url.host() == "promotion.shopping.yahoo.co.jp") { return true; } #endif diff --git a/webkit/user_agent/user_agent_unittest.cc b/webkit/user_agent/user_agent_unittest.cc index 9a6058d..42356ff 100644 --- a/webkit/user_agent/user_agent_unittest.cc +++ b/webkit/user_agent/user_agent_unittest.cc @@ -35,12 +35,9 @@ TEST_F(WebkitGlueUserAgentTest, UserAgentSpoofingHack) { Expected expected[] = { { "http://wwww.google.com", NONE }, { "http://www.microsoft.com/getsilverlight", MACOSX }, - { "http://headlines.yahoo.co.jp/videonews/", MACOSX | WIN }, { "http://downloads.yahoo.co.jp/docs/silverlight/", MACOSX }, { "http://gyao.yahoo.co.jp/", MACOSX }, - { "http://weather.yahoo.co.jp/weather/zoomradar/", WIN }, { "http://promotion.shopping.yahoo.co.jp/", WIN }, - { "http://pokemon.kids.yahoo.co.jp", WIN }, }; #if defined(OS_MACOSX) int os_bit = MACOSX; |