Fix logging of Launch.FlagsAtStartup histogram.

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 <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 2166 matching lines @@
 void RemoveFlagsSwitches(
     std::map<std::string, base::CommandLine::StringType>* switch_list) {
   FlagsStateSingleton::GetFlagsState()->RemoveFlagsSwitches(switch_list);
 }
 
 void ResetAllFlags(flags_ui::FlagsStorage* flags_storage) {
   FlagsStateSingleton::GetFlagsState()->ResetAllFlags(flags_storage);
 }
 
 void RecordUMAStatistics(flags_ui::FlagsStorage* flags_storage) {
-  std::set<std::string> flags = flags_storage->GetFlags();
-  ReportAboutFlagsHistogram("Launch.FlagsAtStartup", flags);
+  std::set<std::string> switches;
+  FlagsStateSingleton::GetFlagsState()->GetSwitchesFromFlags(flags_storage,
+                                                             &switches);
+  ReportAboutFlagsHistogram("Launch.FlagsAtStartup", switches);
 }
 
 base::HistogramBase::Sample GetSwitchUMAId(const std::string& switch_name) {
   return static_cast<base::HistogramBase::Sample>(
       base::HashMetricName(switch_name));
 }
 
 void ReportAboutFlagsHistogram(const std::string& uma_histogram_name,
                                const std::set<std::string>& flags) {
   for (const std::string& flag : flags) {
@@ skipping 26 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags