Revert 228225 "Enable delegated rendering on Aura Windows and Li..."

content/browser/gpu/compositor_util_browsertest.cc

Index: content/browser/gpu/compositor_util_browsertest.cc
===================================================================
--- content/browser/gpu/compositor_util_browsertest.cc	(revision 228384)
+++ content/browser/gpu/compositor_util_browsertest.cc	(working copy)
@@ -21,17 +21,10 @@
   enum CompositingMode {
     DISABLED,
     ENABLED,
-    THREADED,  // Implies FCM
-    DELEGATED,  // Implies threaded
+    THREADED,
   } expected_mode = DISABLED;
-#if defined(USE_AURA)
-#if defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(USE_AURA)
   expected_mode = THREADED;
-#else
-  expected_mode = DELEGATED;
-#endif
-#elif defined(OS_ANDROID)
-  expected_mode = THREADED;
 #elif defined(OS_MACOSX)
   if (base::mac::IsOSMountainLionOrLater())
     expected_mode = ENABLED;
@@ -40,15 +33,9 @@
     expected_mode = ENABLED;
 #endif
 
-  EXPECT_EQ(expected_mode == ENABLED ||
-            expected_mode == THREADED ||
-            expected_mode == DELEGATED,
+  EXPECT_EQ(expected_mode == ENABLED || expected_mode == THREADED,
             IsForceCompositingModeEnabled());
-  EXPECT_EQ(expected_mode == THREADED ||
-            expected_mode == DELEGATED,
-            IsThreadedCompositingEnabled());
-  EXPECT_EQ(expected_mode == DELEGATED,
-            IsDelegatedRendererEnabled());
+  EXPECT_EQ(expected_mode == THREADED, IsThreadedCompositingEnabled());
 }
 
 }