Migrate users from "WebKit" flag to "Web Platform".

chrome/browser/about_flags.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/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 290 matching lines @@
 // To add a new experiment add to the end of kExperiments. There are two
 // distinct types of experiments:
 // . SINGLE_VALUE: experiment is either on or off. Use the SINGLE_VALUE_TYPE
 //   macro for this type supplying the command line to the macro.
 // . MULTI_VALUE: a list of choices, the first of which should correspond to a
 //   deactivated state for this lab (i.e. no command line option).  To specify
 //   this type of experiment use the macro MULTI_VALUE_TYPE supplying it the
 //   array of choices.
 // See the documentation of Experiment for details on the fields.
 //
+

[jochen (gone - plz use gerrit), 2013/07/18 14:51:57]

why the empty line?

 // When adding a new choice, add it to the end of the list.
 const Experiment kExperiments[] = {
   {
     "expose-for-tabs",  // FLAGS:RECORD_UMA
     IDS_FLAGS_TABPOSE_NAME,
     IDS_FLAGS_TABPOSE_DESCRIPTION,
     kOsMac,
 #if defined(OS_MACOSX)
     // The switch exists only on OS X.
     SINGLE_VALUE_TYPE(switches::kEnableExposeForTabs)
@@ skipping 1296 matching lines @@
 #endif
   {
     "enable-device-motion",
     IDS_FLAGS_ENABLE_DEVICE_MOTION_NAME,
     IDS_FLAGS_ENABLE_DEVICE_MOTION_DESCRIPTION,
     kOsAndroid,
     SINGLE_VALUE_TYPE(switches::kEnableDeviceMotion)
   },
 };
 
+const Experiment kDeprecatedExperiments[] = {

[jochen (gone - plz use gerrit), 2013/07/18 14:51:57]

can you add a comment describing how to add deprecated experiments here?

+  {
+    "enable-experimental-webkit-features",
+    0,
+    0,
+    kOsAll,
+    SINGLE_VALUE_TYPE("enable-experimental-webkit-features")
+  },
+};
+
+
 const Experiment* experiments = kExperiments;
 size_t num_experiments = arraysize(kExperiments);
 
 // Stores and encapsulates the little state that about:flags has.
 class FlagsState {
  public:
   FlagsState() : needs_restart_(false) {}
   void ConvertFlagsToSwitches(FlagsStorage* flags_storage,
                               CommandLine* command_line);
   bool IsRestartNeededToCommitChanges();
@@ skipping 51 matching lines @@
       DCHECK(e.command_line_value);
       DCHECK(e.disable_command_line_switch);
       DCHECK(e.disable_command_line_value);
       break;
     default:
       NOTREACHED();
   }
   return true;
 }
 
+// Given the set of currently active experiments, migrate deprecated experiments
+// to their shiny new counterparts.
+void MigrateExperiments(std::set<std::string>* experiments) {
+  struct {
+    const char* const from;
+    const char* const to;
+  } migrations[] = {
+    // TODO(mkwst): Remove this once some reasonable amount of time has passed.
+    {"enable-experimental-webkit-features",
+     "enable-experimental-web-platform-features"}
+  };
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(migrations); ++i) {
+    if (experiments->count(migrations[i].from))
+      experiments->insert(migrations[i].to);
+  }
+}
+
 // Removes all experiments from prefs::kEnabledLabsExperiments that are
 // unknown, to prevent this list to become very long as experiments are added
 // and removed.
 void SanitizeList(FlagsStorage* flags_storage) {
   std::set<std::string> known_experiments;
   for (size_t i = 0; i < num_experiments; ++i) {
     DCHECK(ValidateExperiment(experiments[i]));
+    printf("Known Experiments: %s\n", experiments[i].internal_name);

[jochen (gone - plz use gerrit), 2013/07/18 14:51:57]

?

     AddInternalName(experiments[i], &known_experiments);
   }
 
   std::set<std::string> enabled_experiments = flags_storage->GetFlags();
+  MigrateExperiments(&enabled_experiments);
 
   std::set<std::string> new_enabled_experiments;
   std::set_intersection(
       known_experiments.begin(), known_experiments.end(),
       enabled_experiments.begin(), enabled_experiments.end(),
       std::inserter(new_enabled_experiments, new_enabled_experiments.begin()));
 
+  if (enabled_experiments.count("enable-experimental-web-platform-features"))

[jochen (gone - plz use gerrit), 2013/07/18 14:51:57]

?

+    printf("OLD: WebPlatform is enabled!\n");
+  if (new_enabled_experiments.count("enable-experimental-web-platform-features"))
+    printf("New: WebPlatform is enabled!\n");
+
   if (new_enabled_experiments != enabled_experiments)
     flags_storage->SetFlags(new_enabled_experiments);
 }
 
 void GetSanitizedEnabledFlags(
     FlagsStorage* flags_storage, std::set<std::string>* result) {
   SanitizeList(flags_storage);
   *result = flags_storage->GetFlags();
 }
 
@@ skipping 301 matching lines @@
   std::set<std::string> enabled_experiments;
   GetSanitizedEnabledFlags(flags_storage, &enabled_experiments);
 
   const Experiment* e = NULL;
   for (size_t i = 0; i < num_experiments; ++i) {
     if (experiments[i].internal_name == internal_name) {
       e = experiments + i;
       break;
     }
   }
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kDeprecatedExperiments); ++i) {

[jochen (gone - plz use gerrit), 2013/07/18 14:51:57]

why is this needed?

+    if (kDeprecatedExperiments[i].internal_name == internal_name) {
+      e = kDeprecatedExperiments + i;
+      break;
+    }
+  }
   DCHECK(e);
 
   if (e->type == Experiment::SINGLE_VALUE) {
     if (enable)
       needs_restart_ |= enabled_experiments.insert(internal_name).second;
     else
       needs_restart_ |= (enabled_experiments.erase(internal_name) > 0);
   } else {
     if (enable) {
       // Enable the first choice.
@@ skipping 59 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags