| Index: chrome/browser/plugins/plugin_power_saver_browsertest.cc
|
| diff --git a/chrome/browser/plugins/plugin_power_saver_browsertest.cc b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
|
| index d48cf72bc87a34d059299c7810d05e1c3f9f16fe..afbf3d85a5a84555f8ae751aebaf70330c110d64 100644
|
| --- a/chrome/browser/plugins/plugin_power_saver_browsertest.cc
|
| +++ b/chrome/browser/plugins/plugin_power_saver_browsertest.cc
|
| @@ -547,7 +547,13 @@ IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest,
|
| SimulateClickAndAwaitMarkedEssential("plugin", gfx::Point(50, 50));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, OriginWhitelisting) {
|
| +// Flaky on ASAN bots: crbug.com/560765.
|
| +#if defined(ADDRESS_SANITIZER)
|
| +#define MAYBE_OriginWhitelisting DISABLED_OriginWhitelisting
|
| +#else
|
| +#define MAYBE_OriginWhitelisting OriginWhitelisting
|
| +#endif
|
| +IN_PROC_BROWSER_TEST_F(PluginPowerSaverBrowserTest, MAYBE_OriginWhitelisting) {
|
| LoadHTML(
|
| "<object id='plugin_small' data='http://a.com/fake1.swf' "
|
| " type='application/x-ppapi-tests' width='100' height='100'></object>"
|
|
|