Chromium Code Reviews| Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
| diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
| index 7be9f16e275db2c45b0ebf08628b86bddeb05ed9..96a81e8ccd9633151694d0df5a76fbfe1ed3b6f2 100644 |
| --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
| +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
| @@ -824,12 +824,6 @@ class BrowserPluginThreadedCompositorPixelTest |
| EnablePixelOutput(); |
| BrowserPluginThreadedCompositorTest::SetUp(); |
| } |
| - |
| - virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE { |
| - BrowserPluginThreadedCompositorTest::SetUpCommandLine(cmd); |
| - // http://crbug.com/327035 |
| - cmd->AppendSwitch(switches::kDisableDelegatedRenderer); |
| - } |
| }; |
| static void CompareSkBitmaps(const SkBitmap& expected_bitmap, |
| @@ -897,7 +891,7 @@ static void CompareSkBitmapAndRun(const base::Closure& callback, |
| } |
| // http://crbug.com/171744 |
| -#if defined(OS_MACOSX) |
| +#if defined(OS_MACOSX) || defined(USE_AURA) |
|
sadrul
2014/02/19 20:52:18
Mind updating the comment to include crbug 327035?
danakj
2014/02/19 21:02:43
Done.
|
| #define MAYBE_GetBackingStore DISABLED_GetBackingStore |
| #else |
| #define MAYBE_GetBackingStore GetBackingStore |