Cleaning up compositing field trial code and enable FCM in beta/stable

content/public/common/compositor_util.cc

Index: content/public/common/compositor_util.cc
diff --git a/content/public/common/compositor_util.cc b/content/public/common/compositor_util.cc
new file mode 100644
index 0000000000000000000000000000000000000000..890dff4a341afc1260c3cbc196eed90c91541ab2
--- /dev/null
+++ b/content/public/common/compositor_util.cc
@@ -0,0 +1,45 @@
+// 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/public/common/compositor_util.h"
+
+#include "base/command_line.h"
+#include "base/metrics/field_trial.h"
+#include "content/public/common/content_constants.h"
+#include "content/public/common/content_switches.h"
+
+namespace compositor_util {
+
+bool IsThreadedCompositingEnabled() {
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kEnableThreadedCompositing) &&
+      !command_line.HasSwitch(switches::kDisableThreadedCompositing))
+    return true;
+
+  base::FieldTrial* trial =
+      base::FieldTrialList::Find(content::kGpuCompositingFieldTrialName);
+  return trial &&
+         trial->group_name() ==
+             content::kGpuCompositingFieldTrialThreadEnabledName;
+}
+
+bool IsForceCompositingModeEnabled() {
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kForceCompositingMode) &&
+      !command_line.HasSwitch(switches::kDisableForceCompositingMode))
+    return true;
+
+  base::FieldTrial* trial =
+      base::FieldTrialList::Find(content::kGpuCompositingFieldTrialName);
+
+  // Force compositing is enabled in both the force compositing
+  // and threaded compositing mode field trials.
+  return trial &&
+        (trial->group_name() ==
+            content::kGpuCompositingFieldTrialForceCompositingEnabledName ||
+         trial->group_name() ==
+            content::kGpuCompositingFieldTrialThreadEnabledName);
+}
+
+}  // compositor_util