summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrisr@chromium.org <krisr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-04 01:06:03 +0000
committerkrisr@chromium.org <krisr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-04 01:06:03 +0000
commit37f20cf70515a6cdf930f0ed64a2aa16feb2df53 (patch)
tree43b012732b9642ee5e9533522ec06b3094df30ee
parent0991485ae6cfb83c4a2ea82e4fce652e772d31a0 (diff)
downloadchromium_src-37f20cf70515a6cdf930f0ed64a2aa16feb2df53.zip
chromium_src-37f20cf70515a6cdf930f0ed64a2aa16feb2df53.tar.gz
chromium_src-37f20cf70515a6cdf930f0ed64a2aa16feb2df53.tar.bz2
Update R18 flapper to 11.2.31.103, re-add O3D
Review URL: https://chromiumcodereview.appspot.com/9323050 git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@120447 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/data/chromeos_plugins_list.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/test/data/chromeos_plugins_list.txt b/chrome/test/data/chromeos_plugins_list.txt
index 86349e19..7d7c95ca 100644
--- a/chrome/test/data/chromeos_plugins_list.txt
+++ b/chrome/test/data/chromeos_plugins_list.txt
@@ -4,7 +4,7 @@
u'name': u'Shockwave Flash',
u'path': '/opt/google/chrome/pepper/libpepflashplayer.so',
u'unique_key': 'path',
- u'version': u'11.2.31.100'
+ u'version': u'11.2.31.103'
}, {
u'boards': ['x86-mario', 'x86-alex', 'x86-zgb', 'stumpy'],
u'enabled': 1,
@@ -34,6 +34,11 @@
}, {
u'boards': ['x86-mario', 'x86-alex', 'x86-zgb', 'stumpy', 'lumpy'],
u'enabled': 1,
+ u'name': 'O3D Plugin',
+ u'version': u''
+ }, {
+ u'boards': ['x86-mario', 'x86-alex', 'x86-zgb', 'stumpy', 'lumpy'],
+ u'enabled': 1,
u'name': 'Native Client',
u'version': u''
},