| Index: content/browser/gpu/compositor_util_browsertest.cc
|
| diff --git a/content/browser/gpu/compositor_util_browsertest.cc b/content/browser/gpu/compositor_util_browsertest.cc
|
| index 3bb8eeae20ea4ae97b36b0e96f4421f3a934821a..e4bbd705a568cc74f064d4ec9167e030e51ab154 100644
|
| --- a/content/browser/gpu/compositor_util_browsertest.cc
|
| +++ b/content/browser/gpu/compositor_util_browsertest.cc
|
| @@ -29,8 +29,13 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) {
|
| #elif defined(OS_ANDROID)
|
| expected_mode = THREADED;
|
| #elif defined(OS_MACOSX)
|
| - if (base::mac::IsOSMountainLionOrLater())
|
| - expected_mode = THREADED;
|
| + expected_mode = THREADED;
|
| + // Lion has compositing blacklisted when using the Apple software renderer,
|
| + // so results will vary depending if this test is being run in a VM versus
|
| + // actual hardware.
|
| + // http://crbug.com/230931
|
| + if (base::mac::IsOSLion())
|
| + return;
|
| #elif defined(OS_WIN)
|
| if (base::win::GetVersion() >= base::win::VERSION_VISTA)
|
| expected_mode = THREADED;
|
|
|