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

chrome/browser/chrome_browser_field_trials.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 "chrome/browser/chrome_browser_field_trials.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 102 matching lines @@
   // shoud not be performed.
   if (!proxy_policy_is_set)
     ProxyConnectionsFieldTrial();
   prerender::ConfigurePrefetchAndPrerender(parsed_command_line_);
   SpdyFieldTrial();
   ConnectBackupJobsFieldTrial();
   WarmConnectionFieldTrial();
   PredictorFieldTrial();
   DefaultAppsFieldTrial();
   AutoLaunchChromeFieldTrial();
-  gpu_util::InitializeForceCompositingModeFieldTrial();
+  gpu_util::InitializeCompositingFieldTrial();
   SetupUniformityFieldTrials();
   AutocompleteFieldTrial::Activate();
   DisableNewTabFieldTrialIfNecesssary();
   ChannelIDFieldTrial();
 }
 
 // This is an A/B test for the maximum number of persistent connections per
 // host. Currently Chrome, Firefox, and IE8 have this value set at 6. Safari
 // uses 4, and Fasterfox (a plugin for Firefox that supposedly configures it to
 // run faster) uses 8. We would like to see how much of an effect this value has
@@ skipping 461 matching lines @@
     const base::FieldTrial::Probability kEnableProbability = 10;
     scoped_refptr<base::FieldTrial> trial =
         base::FieldTrialList::FactoryGetFieldTrial(
             "ChannelID", kDivisor, "disable", 2012, 8, 23, NULL);
     trial->UseOneTimeRandomization();
     int enable_group = trial->AppendGroup("enable", kEnableProbability);
     if (trial->group() == enable_group)
       net::SSLConfigService::EnableChannelIDTrial();
   }
 }