Type change in StackSamplingProfiler from void* to uintptr_t.

components/metrics/call_stack_profile_metrics_provider_unittest.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 "base/metrics/call_stack_profile_params.h"
 #include "base/metrics/field_trial.h"
 #include "base/profiler/stack_sampling_profiler.h"
 #include "base/run_loop.h"
@@ skipping 48 matching lines @@
 
 // Checks that all properties from multiple profiles are filled as expected.
 TEST_F(CallStackProfileMetricsProviderTest, MultipleProfiles) {
   const uintptr_t module1_base_address = 0x1000;
   const uintptr_t module2_base_address = 0x2000;
   const uintptr_t module3_base_address = 0x3000;
 
   const Module profile_modules[][2] = {
     {
       Module(
-          reinterpret_cast<const void*>(module1_base_address),
+          module1_base_address,
           "ABCD",
 #if defined(OS_WIN)
           base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
           base::FilePath("/some/path/to/chrome")
 #endif
       ),
       Module(
-          reinterpret_cast<const void*>(module2_base_address),
+          module2_base_address,
           "EFGH",
 #if defined(OS_WIN)
           base::FilePath(L"c:\\some\\path\\to\\third_party.dll")
 #else
           base::FilePath("/some/path/to/third_party.so")
 #endif
       ),
     },
     {
       Module(
-          reinterpret_cast<const void*>(module3_base_address),
+          module3_base_address,
           "MNOP",
 #if defined(OS_WIN)
           base::FilePath(L"c:\\some\\path\\to\\third_party2.dll")
 #else
           base::FilePath("/some/path/to/third_party2.so")
 #endif
       ),
       Module( // Repeated from the first profile.
-          reinterpret_cast<const void*>(module1_base_address),
+          module1_base_address,
           "ABCD",
 #if defined(OS_WIN)
           base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
           base::FilePath("/some/path/to/chrome")
 #endif
       )
     }
   };
 
@@ skipping 32 matching lines @@
   // module index corresponding to the module for the profile in
   // profile_modules.
   //
   // So, the first stack sample below has its top frame in module 0 at an offset
   // of 0x10 from the module's base address, the next-to-top frame in module 1
   // at an offset of 0x20 from the module's base address, and the bottom frame
   // in module 0 at an offset of 0x30 from the module's base address
   const Frame profile_sample_frames[][2][3] = {
     {
       {
-        Frame(reinterpret_cast<const void*>(module1_base_address + 0x10), 0),
-        Frame(reinterpret_cast<const void*>(module2_base_address + 0x20), 1),
-        Frame(reinterpret_cast<const void*>(module1_base_address + 0x30), 0)
+        Frame(module1_base_address + 0x10, 0),
+        Frame(module2_base_address + 0x20, 1),
+        Frame(module1_base_address + 0x30, 0)
       },
       {
-        Frame(reinterpret_cast<const void*>(module2_base_address + 0x10), 1),
-        Frame(reinterpret_cast<const void*>(module1_base_address + 0x20), 0),
-        Frame(reinterpret_cast<const void*>(module2_base_address + 0x30), 1)
+        Frame(module2_base_address + 0x10, 1),
+        Frame(module1_base_address + 0x20, 0),
+        Frame(module2_base_address + 0x30, 1)
       }
     },
     {
       {
-        Frame(reinterpret_cast<const void*>(module3_base_address + 0x10), 0),
-        Frame(reinterpret_cast<const void*>(module1_base_address + 0x20), 1),
-        Frame(reinterpret_cast<const void*>(module3_base_address + 0x30), 0)
+        Frame(module3_base_address + 0x10, 0),
+        Frame(module1_base_address + 0x20, 1),
+        Frame(module3_base_address + 0x30, 0)
       },
       {
-        Frame(reinterpret_cast<const void*>(module1_base_address + 0x10), 1),
-        Frame(reinterpret_cast<const void*>(module3_base_address + 0x20), 0),
-        Frame(reinterpret_cast<const void*>(module1_base_address + 0x30), 1)
+        Frame(module1_base_address + 0x10, 1),
+        Frame(module3_base_address + 0x20, 0),
+        Frame(module1_base_address + 0x30, 1)
       }
     }
   };
 
   base::TimeDelta profile_durations[2] = {
     base::TimeDelta::FromMilliseconds(100),
     base::TimeDelta::FromMilliseconds(200)
   };
 
   base::TimeDelta profile_sampling_periods[2] = {
@@ skipping 88 matching lines @@
   }
 }
 
 // Checks that all duplicate samples are collapsed with
 // preserve_sample_ordering = false.
 TEST_F(CallStackProfileMetricsProviderTest, RepeatedStacksUnordered) {
   const uintptr_t module_base_address = 0x1000;
 
   const Module modules[] = {
     Module(
-        reinterpret_cast<const void*>(module_base_address),
+        module_base_address,
         "ABCD",
 #if defined(OS_WIN)
         base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
         base::FilePath("/some/path/to/chrome")
 #endif
     )
   };
 
   // Duplicate samples in slots 0, 2, and 3.
   const Frame sample_frames[][1] = {
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x10), 0), },
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x20), 0), },
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x10), 0), },
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x10), 0) }
+    { Frame(module_base_address + 0x10, 0), },
+    { Frame(module_base_address + 0x20, 0), },
+    { Frame(module_base_address + 0x10, 0), },
+    { Frame(module_base_address + 0x10, 0) }
   };
 
   Profile profile;
   profile.modules.insert(profile.modules.end(), &modules[0],
       &modules[0] + arraysize(modules));
 
   for (size_t i = 0; i < arraysize(sample_frames); ++i) {
     profile.samples.push_back(Sample());
     Sample& sample = profile.samples.back();
     sample.insert(sample.end(), &sample_frames[i][0],
@@ skipping 42 matching lines @@
   }
 }
 
 // Checks that only contiguous duplicate samples are collapsed with
 // preserve_sample_ordering = true.
 TEST_F(CallStackProfileMetricsProviderTest, RepeatedStacksOrdered) {
   const uintptr_t module_base_address = 0x1000;
 
   const Module modules[] = {
     Module(
-        reinterpret_cast<const void*>(module_base_address),
+        module_base_address,
         "ABCD",
 #if defined(OS_WIN)
         base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
         base::FilePath("/some/path/to/chrome")
 #endif
     )
   };
 
   // Duplicate samples in slots 0, 2, and 3.
   const Frame sample_frames[][1] = {
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x10), 0), },
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x20), 0), },
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x10), 0), },
-    { Frame(reinterpret_cast<const void*>(module_base_address + 0x10), 0) }
+    { Frame(module_base_address + 0x10, 0), },
+    { Frame(module_base_address + 0x20, 0), },
+    { Frame(module_base_address + 0x10, 0), },
+    { Frame(module_base_address + 0x10, 0) }
   };
 
   Profile profile;
   profile.modules.insert(profile.modules.end(), &modules[0],
       &modules[0] + arraysize(modules));
 
   for (size_t i = 0; i < arraysize(sample_frames); ++i) {
     profile.samples.push_back(Sample());
     Sample& sample = profile.samples.back();
     sample.insert(sample.end(), &sample_frames[i][0],
@@ skipping 37 matching lines @@
                 entry.address());
       ASSERT_TRUE(entry.has_module_id_index());
       EXPECT_EQ(sample_frames[i][j].module_index,
                 static_cast<size_t>(entry.module_id_index()));
     }
   }
 }
 
 // Checks that unknown modules produce an empty Entry.
 TEST_F(CallStackProfileMetricsProviderTest, UnknownModule) {
-  const Frame frame(reinterpret_cast<const void*>(0x1000),
-                    Frame::kUnknownModuleIndex);
+  const Frame frame(0x1000, Frame::kUnknownModuleIndex);
 
   Profile profile;
 
   profile.samples.push_back(Sample(1, frame));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
@@ skipping 19 matching lines @@
   EXPECT_FALSE(entry.has_module_id_index());
 }
 
 // Checks that pending profiles are only passed back to ProvideGeneralMetrics
 // once.
 TEST_F(CallStackProfileMetricsProviderTest, ProfilesProvidedOnlyOnce) {
   CallStackProfileMetricsProvider provider;
   for (int i = 0; i < 2; ++i) {
     Profile profile;
     profile.samples.push_back(Sample(1, Frame(
-        reinterpret_cast<const void*>(0x1000), Frame::kUnknownModuleIndex)));
+        0x1000, Frame::kUnknownModuleIndex)));

[Mike Wittman, 2015/09/01 01:42:15]

nit: move first arg to previous line (and second, if possible)

(and below instances)

[sydli, 2015/09/03 16:21:15]

Ran git cl format.

[Mike Wittman, 2015/09/03 16:58:03]

This is fine for this change and below, but has introduced a number of
unnecessary formatting changes above this that make it harder to see what has
changed. Can you undo the reformat of all the places I've noted?

 
     profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
     // Use the sampling period to distinguish the two profiles.
     profile.sampling_period = base::TimeDelta::FromMilliseconds(i);
 
     provider.OnRecordingEnabled();
     AppendProfiles(Params(Params::PROCESS_STARTUP, false),
                    std::vector<Profile>(1, profile));
     ChromeUserMetricsExtension uma_proto;
     provider.ProvideGeneralMetrics(&uma_proto);
 
     ASSERT_EQ(1, uma_proto.sampled_profile().size());
     const SampledProfile& sampled_profile = uma_proto.sampled_profile().Get(0);
     ASSERT_TRUE(sampled_profile.has_call_stack_profile());
     const CallStackProfile& call_stack_profile =
         sampled_profile.call_stack_profile();
     ASSERT_TRUE(call_stack_profile.has_sampling_period_ms());
     EXPECT_EQ(i, call_stack_profile.sampling_period_ms());
   }
 }
 
 // Checks that pending profiles are provided to ProvideGeneralMetrics
 // when collected before CallStackProfileMetricsProvider is instantiated.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesProvidedWhenCollectedBeforeInstantiation) {
   Profile profile;
   profile.samples.push_back(Sample(1, Frame(
-      reinterpret_cast<const void*>(0x1000), Frame::kUnknownModuleIndex)));
+      0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   AppendProfiles(Params(Params::PROCESS_STARTUP, false),
                  std::vector<Profile>(1, profile));
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(1, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics
 // while recording is disabled.
 TEST_F(CallStackProfileMetricsProviderTest, ProfilesNotProvidedWhileDisabled) {
   Profile profile;
   profile.samples.push_back(Sample(1, Frame(
-      reinterpret_cast<const void*>(0x1000), Frame::kUnknownModuleIndex)));
+      0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingDisabled();
   AppendProfiles(Params(Params::PROCESS_STARTUP, false),
                  std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics
 // if recording is disabled while profiling.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesNotProvidedAfterChangeToDisabled) {
   Profile profile;
   profile.samples.push_back(Sample(1, Frame(
-      reinterpret_cast<const void*>(0x1000), Frame::kUnknownModuleIndex)));
+      0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   base::StackSamplingProfiler::CompletedCallback callback =
       CallStackProfileMetricsProvider::GetProfilerCallback(
           Params(Params::PROCESS_STARTUP, false));
 
   provider.OnRecordingDisabled();
   callback.Run(std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics if
 // recording is enabled, but then disabled and reenabled while profiling.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesNotProvidedAfterChangeToDisabledThenEnabled) {
   Profile profile;
   profile.samples.push_back(Sample(1, Frame(
-      reinterpret_cast<const void*>(0x1000), Frame::kUnknownModuleIndex)));
+      0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
   base::StackSamplingProfiler::CompletedCallback callback =
       CallStackProfileMetricsProvider::GetProfilerCallback(
           Params(Params::PROCESS_STARTUP, false));
 
   provider.OnRecordingDisabled();
   provider.OnRecordingEnabled();
   callback.Run(std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 // Checks that pending profiles are not provided to ProvideGeneralMetrics
 // if recording is disabled, but then enabled while profiling.
 TEST_F(CallStackProfileMetricsProviderTest,
        ProfilesNotProvidedAfterChangeFromDisabled) {
   Profile profile;
   profile.samples.push_back(Sample(1, Frame(
-      reinterpret_cast<const void*>(0x1000), Frame::kUnknownModuleIndex)));
+      0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingDisabled();
   base::StackSamplingProfiler::CompletedCallback callback =
       CallStackProfileMetricsProvider::GetProfilerCallback(
           Params(Params::PROCESS_STARTUP, false));
 
   provider.OnRecordingEnabled();
   callback.Run(std::vector<Profile>(1, profile));
   ChromeUserMetricsExtension uma_proto;
   provider.ProvideGeneralMetrics(&uma_proto);
 
   EXPECT_EQ(0, uma_proto.sampled_profile_size());
 }
 
 }  // namespace metrics