summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrohitbm@google.com <rohitbm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 23:23:09 +0000
committerrohitbm@google.com <rohitbm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-02 23:23:09 +0000
commit0a22e72cf30bb13e79d5d20ff6eee79132aa0511 (patch)
tree497b3a6f0e929b8dc0f7ed92b3f3e3e769704b7f
parent9680b49042c51140d2851d5bf9e51d618723c383 (diff)
downloadchromium_src-0a22e72cf30bb13e79d5d20ff6eee79132aa0511.zip
chromium_src-0a22e72cf30bb13e79d5d20ff6eee79132aa0511.tar.gz
chromium_src-0a22e72cf30bb13e79d5d20ff6eee79132aa0511.tar.bz2
Merge 73535 - BUG=71617
Review URL: http://codereview.chromium.org/6410042 TBR=rohitbm@google.com Review URL: http://codereview.chromium.org/6286065 git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@73536 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/functional/PYAUTO_TESTS1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/test/functional/PYAUTO_TESTS b/chrome/test/functional/PYAUTO_TESTS
index 8839541..ede2ebd 100644
--- a/chrome/test/functional/PYAUTO_TESTS
+++ b/chrome/test/functional/PYAUTO_TESTS
@@ -62,6 +62,7 @@
'passwords',
'pdf',
'plugins',
+ '-plugins.PluginsTest.testBlockPluginException', # crbug.com/71617
'popups',
'prefs',
'search_engines',