diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 20:46:20 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-17 20:46:20 +0000 |
| commit | e1c715a35ad7d6f414446ed5141a394b01b6b10e (patch) | |
| tree | 774c7220797439ef04f0804da52c26def1754da8 /chrome/browser/extensions/plugin_apitest.cc | |
| parent | e7bc1364cbc41576812c0e2531a1b6dc31ca2d96 (diff) | |
| download | chromium_src-e1c715a35ad7d6f414446ed5141a394b01b6b10e.zip chromium_src-e1c715a35ad7d6f414446ed5141a394b01b6b10e.tar.gz chromium_src-e1c715a35ad7d6f414446ed5141a394b01b6b10e.tar.bz2 | |
Revert 147032 - Setup DOMOperationObserver before calling JavaScript methods in ui_test_utils methods, so we don't miss notifications.
BUG=123851
TEST=ExtensionBrowserTest.PluginLoadUnload
Review URL: https://chromiumcodereview.appspot.com/10690040
TBR=bauerb@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10782039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/plugin_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/plugin_apitest.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 6bbc809..4987eca 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -21,9 +21,16 @@ using content::NavigationController; using content::WebContents; using extensions::Extension; +#if defined(OS_WIN) && !defined(NDEBUG) +// http://crbug.com/123851 flaky fails on win debug. +#define MAYBE_PluginLoadUnload DISABLED_PluginLoadUnload +#else +#define MAYBE_PluginLoadUnload PluginLoadUnload +#endif + // Tests that a renderer's plugin list is properly updated when we load and // unload an extension that contains a plugin. -IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginLoadUnload) { +IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { browser()->profile()->GetPrefs()->SetBoolean(prefs::kPluginsAlwaysAuthorize, true); |