Supporting command line argument to force field trials

chrome/browser/autocomplete/autocomplete_field_trial.cc

Index: chrome/browser/autocomplete/autocomplete_field_trial.cc
diff --git a/chrome/browser/autocomplete/autocomplete_field_trial.cc b/chrome/browser/autocomplete/autocomplete_field_trial.cc
index 0b0876a3da1ce75a91b9a4a9b2b696a8ab5e7a68..646f447cf7a15b8790e585ad0ccb2eaa2d51d8ac 100644
--- a/chrome/browser/autocomplete/autocomplete_field_trial.cc
+++ b/chrome/browser/autocomplete/autocomplete_field_trial.cc
@@ -64,18 +64,19 @@ void AutocompleteFieldTrial::Activate() {
   if (base::FieldTrialList::IsOneTimeRandomizationEnabled()) {  // sticky trials
     // Create aggressive History URL Provider field trial.
     // Make it expire on August 1, 2012.
-    scoped_refptr<base::FieldTrial> trial(new base::FieldTrial(
-        kAggressiveHUPFieldTrialName, kAggressiveHUPFieldTrialDivisor,
-        "Standard", 2012, 8, 1));
+    scoped_refptr<base::FieldTrial> trial(
+        base::FieldTrialList::GetFieldTrialInstance(
+            kAggressiveHUPFieldTrialName, kAggressiveHUPFieldTrialDivisor,
+            "Standard", NULL, 2012, 8, 1));
     trial->UseOneTimeRandomization();
     aggressive_hup_experiment_group = trial->AppendGroup("Aggressive",
         kAggressiveHUPFieldTrialExperimentFraction);
 
     // Create inline History Quick Provider field trial.
     // Make it expire on November 8, 2012.
-    trial = new base::FieldTrial(
+    trial = base::FieldTrialList::GetFieldTrialInstance(
         kDisallowInlineHQPFieldTrialName, kDisallowInlineHQPFieldTrialDivisor,
-        "Standard", 2012, 11, 8);
+        "Standard", NULL, 2012, 11, 8);
     trial->UseOneTimeRandomization();
     disallow_inline_hqp_experiment_group = trial->AppendGroup("DisallowInline",
         kDisallowInlineHQPFieldTrialExperimentFraction);
@@ -84,9 +85,10 @@ void AutocompleteFieldTrial::Activate() {
   // Create the suggest field trial (regardless of sticky-ness status, but
   // make it sticky if possible).
   // Make it expire on October 1, 2012.
-  scoped_refptr<base::FieldTrial> trial(new base::FieldTrial(
-      kSuggestFieldTrialName, kSuggestFieldTrialNumberOfGroups,
-      "0", 2012, 10, 1));
+  scoped_refptr<base::FieldTrial> trial(
+      base::FieldTrialList::GetFieldTrialInstance(
+        kSuggestFieldTrialName, kSuggestFieldTrialNumberOfGroups,
+        "0", NULL, 2012, 10, 1));
   if (base::FieldTrialList::IsOneTimeRandomizationEnabled())
     trial->UseOneTimeRandomization();
   // We've already created one group; now just need to create