Fix SimpleCache field trial creation.

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 "apps/field_trial_names.h"
 #include "apps/pref_names.h"
@@ skipping 186 matching lines @@
     trial->Disable();
   }
 }
 
 // Sets up the experiment. The actual cache backend choice is made in the net/
 // internals by looking at the experiment state.
 void ChromeBrowserFieldTrials::SetUpSimpleCacheFieldTrial() {
   if (parsed_command_line_.HasSwitch(switches::kUseSimpleCacheBackend)) {
     const std::string opt_value = parsed_command_line_.GetSwitchValueASCII(
         switches::kUseSimpleCacheBackend);
-    if (LowerCaseEqualsASCII(opt_value, "off")) {
-      // This is the default.
-      return;
-    }
     const base::FieldTrial::Probability kDivisor = 100;
     scoped_refptr<base::FieldTrial> trial(
         base::FieldTrialList::FactoryGetFieldTrial("SimpleCacheTrial", kDivisor,
-                                                   "No", 2013, 12, 31, NULL));
+                                                   "ExperimentNo", 2013, 12, 31,
+                                                   NULL));
     trial->UseOneTimeRandomization();
+    if (LowerCaseEqualsASCII(opt_value, "off")) {
+      trial->AppendGroup("ExplicitNo", 100);

[Alexei Svitkine (slow), 2013/04/17 16:50:25]

Use kDivisor?

+      return;
+    }
     if (LowerCaseEqualsASCII(opt_value, "on")) {
-      trial->AppendGroup("Yes", 100);
+      trial->AppendGroup("ExplicitYes", 100);

[Alexei Svitkine (slow), 2013/04/17 16:50:25]

Use kDivisor?

       return;
     }
 #if defined(OS_ANDROID)
     if (LowerCaseEqualsASCII(opt_value, "experiment")) {
       // TODO(pasko): Make this the default on Android when the simple cache
       // adds a few more necessary features. Also adjust the probability.
       const base::FieldTrial::Probability kSimpleCacheProbability = 1;
-      trial->AppendGroup("Yes", kSimpleCacheProbability);
-      trial->AppendGroup("Control", kSimpleCacheProbability);
+      trial->AppendGroup("ExperimentYes", kSimpleCacheProbability);
+      trial->AppendGroup("ExperimentControl", kSimpleCacheProbability);
       trial->group();
     }
 #endif
   }
 }
 
 void ChromeBrowserFieldTrials::SetUpCacheSensitivityAnalysisFieldTrial() {
   const base::FieldTrial::Probability kDivisor = 100;
 
   base::FieldTrial::Probability sensitivity_analysis_probability = 0;
@@ skipping 39 matching lines @@
   // Call |FindValue()| on the trials below, which may come from the server, to
   // ensure they get marked as "used" for the purposes of data reporting.
   base::FieldTrialList::FindValue("UMA-Dynamic-Binary-Uniformity-Trial");
   base::FieldTrialList::FindValue("UMA-Dynamic-Uniformity-Trial");
   base::FieldTrialList::FindValue("InstantDummy");
   base::FieldTrialList::FindValue("InstantChannel");
   base::FieldTrialList::FindValue("Test0PercentDefault");
   // Activate the autocomplete dynamic field trials.
   OmniboxFieldTrial::ActivateDynamicTrials();
 }