Log base::Features in Launch.FlagsAtStartup

chrome/browser/about_flags_unittest.cc

 // Copyright (c) 2011 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 <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 150 matching lines @@
 
 std::string FilePathStringTypeToString(const base::FilePath::StringType& path) {
 #if defined(OS_WIN)
   return base::UTF16ToUTF8(path);
 #else
   return path;
 #endif
 }
 
 // Get all associated switches corresponding to defined about_flags.cc entries.
-// Does not include information about FEATURE_VALUE or
-// FEATURE_WITH_VARIATIOSN_VALUE entries.
-std::set<std::string> GetAllSwitchesForTesting() {
+// Does not include information about FEATURE_WITH_VARIATIONS_VALUE entries.
+std::set<std::string> GetAllSwitchesAndFeaturesForTesting() {
   std::set<std::string> result;
 
   size_t num_entries = 0;
   const flags_ui::FeatureEntry* entries =
       testing::GetFeatureEntries(&num_entries);
 
   for (size_t i = 0; i < num_entries; ++i) {
     const flags_ui::FeatureEntry& entry = entries[i];
     switch (entry.type) {
       case flags_ui::FeatureEntry::SINGLE_VALUE:
       case flags_ui::FeatureEntry::SINGLE_DISABLE_VALUE:
         result.insert(entry.command_line_switch);
         break;
       case flags_ui::FeatureEntry::MULTI_VALUE:
         for (int j = 0; j < entry.num_options; ++j) {
           result.insert(entry.ChoiceForOption(j).command_line_switch);
         }
         break;
       case flags_ui::FeatureEntry::ENABLE_DISABLE_VALUE:
         result.insert(entry.command_line_switch);
         result.insert(entry.disable_command_line_switch);
         break;
       case flags_ui::FeatureEntry::FEATURE_VALUE:
+        result.insert(std::string(entry.feature->name) + ":enabled");
+        result.insert(std::string(entry.feature->name) + ":disabled");
+        break;
       case flags_ui::FeatureEntry::FEATURE_WITH_VARIATIONS_VALUE:

[Alexei Svitkine (slow), 2016/09/16 20:50:33]

I think it's fine to handle this same as the above case.

[lawrencewu, 2016/09/16 21:20:03]

Done.

         break;
     }
   }
   return result;
 }
 
 }  // anonymous namespace
 
 // Makes sure there are no separators in any of the entry names.
 TEST(AboutFlagsTest, NoSeparators) {
@@ skipping 68 matching lines @@
     EXPECT_EQ(uma_id, entry.first)
         << "histograms.xml enum LoginCustomFlags "
            "entry '" << entry.second << "' has incorrect value=" << entry.first
         << ", but " << uma_id << " is expected. Consider changing entry to:\n"
         << "  " << GetHistogramEnumEntryText(entry.second, uma_id);
     SetSwitchToHistogramIdMapping(entry.second, entry.first,
                                   &histograms_xml_switches_ids);
   }
 
   // Check that all flags in about_flags.cc have entries in login_custom_flags.
-  std::set<std::string> all_switches = GetAllSwitchesForTesting();
-  for (const std::string& flag : all_switches) {
+  std::set<std::string> all_flags = GetAllSwitchesAndFeaturesForTesting();
+  for (const std::string& flag : all_flags) {
     // Skip empty placeholders.
     if (flag.empty())
       continue;
     const Sample uma_id = GetSwitchUMAId(flag);
     EXPECT_NE(testing::kBadSwitchFormatHistogramId, uma_id)
         << "Command-line switch '" << flag
         << "' from about_flags.cc has UMA ID equal to reserved value "
            "kBadSwitchFormatHistogramId="
         << testing::kBadSwitchFormatHistogramId
         << ". Please modify switch name.";
     SwitchToIdMap::iterator enum_entry =
         histograms_xml_switches_ids.lower_bound(flag);
 
     // Ignore case here when switch ID is incorrect - it has already been
     // reported in the previous loop.
     EXPECT_TRUE(enum_entry != histograms_xml_switches_ids.end() &&
                 enum_entry->first == flag)
         << "histograms.xml enum LoginCustomFlags doesn't contain switch '"
         << flag << "' (value=" << uma_id
         << " expected). Consider adding entry:\n"
         << "  " << GetHistogramEnumEntryText(flag, uma_id);
   }
 }
 
 }  // namespace about_flags