diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-25 01:45:28 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-25 01:45:28 +0000 |
| commit | 267adb733c6784b14695b6fba06ec4194fcf6d02 (patch) | |
| tree | 853cd71b37d5fa9ec1fc663cee6f16af3b91087e /webkit | |
| parent | 2c52b8dd0bda280fdcd0bad0764b5628163210a9 (diff) | |
| download | chromium_src-267adb733c6784b14695b6fba06ec4194fcf6d02.zip chromium_src-267adb733c6784b14695b6fba06ec4194fcf6d02.tar.gz chromium_src-267adb733c6784b14695b6fba06ec4194fcf6d02.tar.bz2 | |
Merge 152626 - Fix IcedTea plug-in being always considered out-of-date:
- Update version parsing logic so version isn't shown blank.
- Drop version requirements because we can't require anything useful any more.
- We still have some defense via the "permission" infobar, on by default on
Linux.
BUG=138386
Review URL: https://chromiumcodereview.appspot.com/10823431
TBR=cevans@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10882046
git-svn-id: svn://svn.chromium.org/chrome/branches/1229/src@153373 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/plugin_lib_posix.cc | 2 | ||||
| -rw-r--r-- | webkit/plugins/npapi/plugin_lib_unittest.cc | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/webkit/plugins/npapi/plugin_lib_posix.cc b/webkit/plugins/npapi/plugin_lib_posix.cc index bae5a49..b9f2c17 100644 --- a/webkit/plugins/npapi/plugin_lib_posix.cc +++ b/webkit/plugins/npapi/plugin_lib_posix.cc @@ -273,7 +273,7 @@ void PluginLib::ExtractVersionString(const std::string& desc, } kPrePostFixes[] = { { "Shockwave Flash ", 0 }, { "Java(TM) Plug-in ", 0 }, - { "(using IcedTea6 ", " " }, + { "(using IcedTea-Web ", " " }, { 0, 0 } }; std::string version; diff --git a/webkit/plugins/npapi/plugin_lib_unittest.cc b/webkit/plugins/npapi/plugin_lib_unittest.cc index c9283c3..a21e1f6 100644 --- a/webkit/plugins/npapi/plugin_lib_unittest.cc +++ b/webkit/plugins/npapi/plugin_lib_unittest.cc @@ -165,15 +165,10 @@ TEST(PluginDescriptionParse, ExtractVersion) { // It's actually much more likely for a modern Linux distribution to have // IcedTea. PluginLib::ExtractVersionString( - "IcedTea NPR Web Browser Plugin " - "(using IcedTea6 1.9.2 (6b20-1.9.2-0ubuntu1~10.04.1))", + "IcedTea-Web Plugin " + "(using IcedTea-Web 1.2 (1.2-2ubuntu0.10.04.2))", &info); - EXPECT_EQ(ASCIIToUTF16("1.9.2"), info.version); - PluginLib::ExtractVersionString( - "IcedTea NPR Web Browser Plugin " - "(using IcedTea6 1.9.3 (fedora-49.1.9.3.fc14-i386))`", - &info); - EXPECT_EQ(ASCIIToUTF16("1.9.3"), info.version); + EXPECT_EQ(ASCIIToUTF16("1.2"), info.version); } #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |