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

chrome/browser/gpu_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_GPU_UTIL_H_
 #define CHROME_BROWSER_GPU_UTIL_H_
 
 #include <string>
 
 #include "content/public/common/gpu_feature_type.h"
@@ skipping 52 matching lines @@
 //
 // Caller is responsible for deleting the returned value.
 base::Value* GetFeatureStatus();
 
 // Returns the GpuInfo as a DictionaryValue.
 base::DictionaryValue* GpuInfoAsDictionaryValue();
 
 // Send UMA histograms about the enabled features.
 void UpdateStats();
 
-// Returns whether this client has been selected for the force-compositing-mode
-// or threaded-compositor trial.
-bool InForceCompositingModeOrThreadTrial();
-
-// Sets up the force-compositing-mode field trial.
-void InitializeForceCompositingModeFieldTrial();
+// Sets up force-compositing-mode and threaded compositing field trials.
+void InitializeCompositingFieldTrial();
 
 }  // namespace gpu_util
 
 #endif  // CHROME_BROWSER_GPU_UTIL_H_