1 files changed, 9 insertions, 11 deletions
diff --git a/src/trace_processor/importers/proto/system_probes_parser.h b/src/trace_processor/importers/proto/system_probes_parser.h
index c9f66c03b..a3040346f 100644
--- a/src/trace_processor/importers/proto/system_probes_parser.h
+++ b/src/trace_processor/importers/proto/system_probes_parser.h
@@ -17,7 +17,6 @@
 #ifndef SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_SYSTEM_PROBES_PARSER_H_
 #define SRC_TRACE_PROCESSOR_IMPORTERS_PROTO_SYSTEM_PROBES_PARSER_H_
 
-#include <array>
 #include <set>
 #include <vector>
 
@@ -61,25 +60,24 @@ class SystemProbesParser {
   const StringId cpu_times_irq_ns_id_;
   const StringId cpu_times_softirq_ns_id_;
   const StringId oom_score_adj_id_;
-  const StringId thread_time_in_state_id_;
-  const StringId thread_time_in_state_cpu_id_;
-  const StringId cpu_freq_id_;
   std::vector<StringId> meminfo_strs_id_;
   std::vector<StringId> vmstat_strs_id_;
 
   // Maps a proto field number for memcounters in ProcessStats::Process to
   // their StringId. Keep kProcStatsProcessSize equal to 1 + max proto field
-  // id of ProcessStats::Process. Also update the value in
-  // ChromeSystemProbesParser.
-  static constexpr size_t kProcStatsProcessSize = 15;
+  // id of ProcessStats::Process.
+  static constexpr size_t kProcStatsProcessSize = 11;
   std::array<StringId, kProcStatsProcessSize> proc_stats_process_names_{};
 
   uint64_t ms_per_tick_ = 0;
 
-  // Maps CPU frequency indices to frequencies from the cpu_freq table to be
-  // stored in the args table as a dimension of the time_in_state counter.
-  // Includes guards at both ends.
-  std::vector<uint32_t> thread_time_in_state_cpu_freqs_;
+  // Maps CPU indices to CPU strings: time_in_state.cpuN.
+  // Includes a guard at the end.
+  std::vector<StringId> thread_time_in_state_cpu_str_ids_;
+
+  // Maps CPU frequency indices to frequency strings for the args table.
+  // Includes a guard at the end.
+  std::vector<StringId> thread_time_in_state_cpu_freq_ids_;
 
   // thread_time_in_state_freq_index_[cpu] points to the first frequency for
   // cpu in thread_time_in_state_cpu_freq_ids_. Includes a guard at the end.