diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 14:49:31 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-07 14:49:31 +0000 |
| commit | 6136e63a06940dad69c24d0c3ccc34ec839020f3 (patch) | |
| tree | 0b0e0da7264200b10d0cd13479833b5529f83c64 /chrome/browser | |
| parent | 55b9d8ef1021e031bc52cbc050a43b924223be64 (diff) | |
| download | chromium_src-6136e63a06940dad69c24d0c3ccc34ec839020f3.zip chromium_src-6136e63a06940dad69c24d0c3ccc34ec839020f3.tar.gz chromium_src-6136e63a06940dad69c24d0c3ccc34ec839020f3.tar.bz2 | |
Fix a bug effectively disabling the default plugin.
Also, re-enable DefaultPluginUITest.DefaultPluginLoadTest.
BUG=48388,46662
TEST=DefaultPluginUITest.DefaultPluginLoadTest
Review URL: http://codereview.chromium.org/2854041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/default_plugin_uitest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/default_plugin_uitest.cc b/chrome/browser/default_plugin_uitest.cc index 9064ae0..c6c5221 100644 --- a/chrome/browser/default_plugin_uitest.cc +++ b/chrome/browser/default_plugin_uitest.cc @@ -16,8 +16,7 @@ class DefaultPluginUITest : public UITest { } }; -// Failing consistently: crbug/46662 -TEST_F(DefaultPluginUITest, DISABLED_DefaultPluginLoadTest) { +TEST_F(DefaultPluginUITest, DefaultPluginLoadTest) { // Open page with default plugin. FilePath test_file(test_data_directory_); test_file = test_file.AppendASCII("default_plugin.html"); |