Enforce FCM settings via the blacklist rather than in-code version checks.

content/browser/gpu/compositor_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/gpu/compositor_util.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "build/build_config.h"
 #include "content/public/browser/gpu_data_manager.h"
@@ skipping 73 matching lines @@
 
   // Command line switches take precedence over blacklisting and field trials.
   if (command_line.HasSwitch(switches::kDisableForceCompositingMode))
     return false;
   else if (command_line.HasSwitch(switches::kForceCompositingMode))
     return true;
 
   if (!CanDoAcceleratedCompositing() || IsForceCompositingModeBlacklisted())
     return false;
 
-  // Hardcode some platforms to use FCM, this has to be done here instead of via
-  // the field trial so that this configuration is used on try bots as well.
-  // TODO(gab): Do the same thing in IsThreadedCompositingEnabled() once this is
-  // stable.
-  // TODO(gab): Use the GPU blacklist instead of hardcoding OS versions here
-  // https://codereview.chromium.org/23534006.
-#if defined(OS_MACOSX)
-  // Mac OSX 10.8+ has been shipping with FCM enabled at 100% since M28.
-  return base::mac::IsOSMountainLionOrLater();
-#elif defined(OS_WIN)
-  // Windows Vista+ has been shipping with FCM enabled at 100% since M24.
-  return base::win::GetVersion() >= base::win::VERSION_VISTA;
+// TODO(gab): Do the same thing for TCM above once this is stable.
+#if defined(OS_MACOSX) || defined(OS_WIN)
+  // Windows Vista+ has been shipping with FCM enabled at 100% since M24 and
+  // Mac OSX 10.8+ since M28. The blacklist check above takes care of returning
+  // false before this hits on unsupported Win/Mac versions.
+  return true;
 #endif
 
   return false;
 }
 
 bool IsDelegatedRendererEnabled() {
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   bool enabled = false;
 
 #if defined(USE_AURA) && !defined(OS_CHROMEOS)
@@ skipping 24 matching lines @@
   bool enabled = false;
 
   // Flags override.
   enabled |= command_line.HasSwitch(switches::kEnableDeadlineScheduling);
   enabled &= !command_line.HasSwitch(switches::kDisableDeadlineScheduling);
 
   return enabled;
 }
 
 }  // namespace content