StackSamplingProfiler clean up

components/metrics/call_stack_profile_metrics_provider.cc

 // Copyright 2015 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 "components/metrics/call_stack_profile_metrics_provider.h"
 
 #include <cstring>
 #include <map>
 #include <utility>
 
@@ skipping 24 matching lines @@
 // compute module instruction pointer offsets.
 void CopySampleToProto(
     const StackSamplingProfiler::Sample& sample,
     const std::vector<StackSamplingProfiler::Module>& modules,
     CallStackProfile::Sample* proto_sample) {
   for (const StackSamplingProfiler::Frame& frame : sample) {
     CallStackProfile::Entry* entry = proto_sample->add_entry();
     // A frame may not have a valid module. If so, we can't compute the
     // instruction pointer offset, and we don't want to send bare pointers, so
     // leave call_stack_entry empty.
-    if (frame.module_index < 0)
+    if (frame.module_index == StackSamplingProfiler::Frame::kUnknownModuleIndex)
       continue;
     int64 module_offset =
         reinterpret_cast<const char*>(frame.instruction_pointer) -
         reinterpret_cast<const char*>(modules[frame.module_index].base_address);
     DCHECK_GE(module_offset, 0);
     entry->set_address(static_cast<uint64>(module_offset));
     entry->set_module_id_index(frame.module_index);
   }
 }
 
 // Transcode |profile| into |proto_profile|.
 void CopyProfileToProto(
-    const StackSamplingProfiler::Profile& profile,
+    const StackSamplingProfiler::CallStackProfile& profile,
     CallStackProfile* proto_profile) {
   if (profile.samples.empty())
     return;
 
   if (profile.preserve_sample_ordering) {
     // Collapse only consecutive repeated samples together.
     CallStackProfile::Sample* current_sample_proto = nullptr;
     for (auto it = profile.samples.begin(); it != profile.samples.end(); ++it) {
       if (!current_sample_proto || *it != *(it - 1)) {
         current_sample_proto = proto_profile->add_sample();
@@ skipping 36 matching lines @@
       profile.sampling_period.InMilliseconds());
 }
 }  // namespace
 
 CallStackProfileMetricsProvider::CallStackProfileMetricsProvider() {}
 
 CallStackProfileMetricsProvider::~CallStackProfileMetricsProvider() {}
 
 void CallStackProfileMetricsProvider::ProvideGeneralMetrics(
     ChromeUserMetricsExtension* uma_proto) {
-  std::vector<StackSamplingProfiler::Profile> profiles;
+  std::vector<StackSamplingProfiler::CallStackProfile> profiles;
   if (!source_profiles_for_test_.empty())
     profiles.swap(source_profiles_for_test_);
   else
     StackSamplingProfiler::GetPendingProfiles(&profiles);
 
-  for (const StackSamplingProfiler::Profile& profile : profiles) {
+  for (const StackSamplingProfiler::CallStackProfile& profile : profiles) {
     CallStackProfile* call_stack_profile =
         uma_proto->add_sampled_profile()->mutable_call_stack_profile();
     CopyProfileToProto(profile, call_stack_profile);
   }
 }
 
 void CallStackProfileMetricsProvider::SetSourceProfilesForTesting(
-    const std::vector<StackSamplingProfiler::Profile>& profiles) {
+    const std::vector<StackSamplingProfiler::CallStackProfile>& profiles) {
   source_profiles_for_test_ = profiles;
 }
 
 }  // namespace metrics