Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: content/browser/gpu/compositor_util_browsertest.cc

Issue 23447045: Always enable FCM on Mac 10.8. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review: zmo Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu/compositor_util.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 375a51adb3751a25b27dbedd5acfc8ff9fbf5df9..75fc60e429fa0ae15d511eae3c11708a5189e9e7 100644
--- a/content/browser/gpu/compositor_util_browsertest.cc
+++ b/content/browser/gpu/compositor_util_browsertest.cc
@@ -5,7 +5,9 @@
#include "content/browser/gpu/compositor_util.h"
#include "content/test/content_browser_test.h"
-#if defined(OS_WIN)
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#elif defined(OS_WIN)
#include "base/win/windows_version.h"
#endif
@@ -23,6 +25,9 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) {
} expected_mode = DISABLED;
#if defined(OS_ANDROID) || defined(USE_AURA)
expected_mode = THREADED;
+#elif defined(OS_MACOSX)
+ if (base::mac::IsOSMountainLionOrLater())
+ expected_mode = ENABLED;
#elif defined(OS_WIN)
if (base::win::GetVersion() >= base::win::VERSION_VISTA)
expected_mode = ENABLED;
« no previous file with comments | « content/browser/gpu/compositor_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698