Enable delegated rendering on Aura Windows and Linux (not Chrome OS)

content/browser/gpu/compositor_util_browsertest.cc

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 75fc60e429fa0ae15d511eae3c11708a5189e9e7..2921bae27942aa940fec331f64c55c4a096d47e5 100644
--- a/content/browser/gpu/compositor_util_browsertest.cc
+++ b/content/browser/gpu/compositor_util_browsertest.cc
@@ -21,9 +21,16 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) {
   enum CompositingMode {
     DISABLED,
     ENABLED,
-    THREADED,
+    THREADED,  // Implies FCM
+    DELEGATED,  // Implies threaded
   } expected_mode = DISABLED;
-#if defined(OS_ANDROID) || defined(USE_AURA)
+#if defined(USE_AURA)
+#if defined(OS_CHROMEOS)
+  expected_mode = THREADED;
+#else
+  expected_mode = DELEGATED;
+#endif
+#elif defined(OS_ANDROID)
   expected_mode = THREADED;
 #elif defined(OS_MACOSX)
   if (base::mac::IsOSMountainLionOrLater())
@@ -33,9 +40,15 @@ IN_PROC_BROWSER_TEST_F(CompositorUtilTest, CompositingModeAsExpected) {
     expected_mode = ENABLED;
 #endif
 
-  EXPECT_EQ(expected_mode == ENABLED || expected_mode == THREADED,
+  EXPECT_EQ(expected_mode == ENABLED ||
+            expected_mode == THREADED ||
+            expected_mode == DELEGATED,
             IsForceCompositingModeEnabled());
-  EXPECT_EQ(expected_mode == THREADED, IsThreadedCompositingEnabled());
+  EXPECT_EQ(expected_mode == THREADED ||
+            expected_mode == DELEGATED,
+            IsThreadedCompositingEnabled());
+  EXPECT_EQ(expected_mode == DELEGATED,
+            IsDelegatedRendererEnabled());
 }
 
 }