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/field_trial.h"
 #include "base/profiler/stack_sampling_profiler.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 45 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(CallStackProfileMetricsProviderTest);
 };
 
 // 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),
-          "ABCD",
+      {

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

Please undo reformatting (see "git cl format" comment).

[sydli, 2015/09/03 17:18:13]

Gotcha. Unreformatted.

+          Module(module1_base_address, "ABCD",
 #if defined(OS_WIN)
-          base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
+                 base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
-          base::FilePath("/some/path/to/chrome")
+                 base::FilePath("/some/path/to/chrome")
 #endif
-      ),
-      Module(
-          reinterpret_cast<const void*>(module2_base_address),
-          "EFGH",
+                     ),
+          Module(module2_base_address, "EFGH",
 #if defined(OS_WIN)
-          base::FilePath(L"c:\\some\\path\\to\\third_party.dll")
+                 base::FilePath(L"c:\\some\\path\\to\\third_party.dll")
 #else
-          base::FilePath("/some/path/to/third_party.so")
+                 base::FilePath("/some/path/to/third_party.so")
 #endif
-      ),
-    },
-    {
-      Module(
-          reinterpret_cast<const void*>(module3_base_address),
-          "MNOP",
+                     ),
+      },
+      {Module(module3_base_address, "MNOP",
 #if defined(OS_WIN)
-          base::FilePath(L"c:\\some\\path\\to\\third_party2.dll")
+              base::FilePath(L"c:\\some\\path\\to\\third_party2.dll")
 #else
-          base::FilePath("/some/path/to/third_party2.so")
+              base::FilePath("/some/path/to/third_party2.so")
 #endif
-      ),
-      Module( // Repeated from the first profile.
-          reinterpret_cast<const void*>(module1_base_address),
-          "ABCD",
+                  ),
+       Module(  // Repeated from the first profile.
+           module1_base_address, "ABCD",
 #if defined(OS_WIN)
-          base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
+           base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
-          base::FilePath("/some/path/to/chrome")
+           base::FilePath("/some/path/to/chrome")
 #endif
-      )
-    }
-  };
+               )}};
 
   // Values for Windows generated with:
   // perl -MDigest::MD5=md5 -MEncode=encode
   //     -e 'for(@ARGV){printf "%x\n", unpack "Q>", md5 encode "UTF-16LE", $_}'
   //     chrome.exe third_party.dll third_party2.dll
   //
   // Values for Linux generated with:
   // perl -MDigest::MD5=md5
   //     -e 'for(@ARGV){printf "%x\n", unpack "Q>", md5 $_}'
   //     chrome third_party.so third_party2.so
@@ skipping 21 matching lines @@
   // Represents two stack samples for each of two profiles, where each stack
   // contains three frames. Each frame contains an instruction pointer and a
   // 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(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(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(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, 0),

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

Please undo reformatting.

+        Frame(module2_base_address + 0x20, 1),
+        Frame(module1_base_address + 0x30, 0)},
+       {Frame(module2_base_address + 0x10, 1),
+        Frame(module1_base_address + 0x20, 0),
+        Frame(module2_base_address + 0x30, 1)}},
+      {{Frame(module3_base_address + 0x10, 0),
+        Frame(module1_base_address + 0x20, 1),
+        Frame(module3_base_address + 0x30, 0)},
+       {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] = {
     base::TimeDelta::FromMilliseconds(10),
     base::TimeDelta::FromMilliseconds(20)
   };
@@ skipping 86 matching lines @@
     EXPECT_EQ(SampledProfile::PROCESS_STARTUP, sampled_profile.trigger_event());
   }
 }
 
 // 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),
-        "ABCD",
+    Module(module_base_address, "ABCD",

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

Please undo reformatting.

 #if defined(OS_WIN)
-        base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
+           base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
-        base::FilePath("/some/path/to/chrome")
+           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) }
-  };
+  const Frame sample_frames[][1] = {{

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

Please undo reformatting.

+                                        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],
                   &sample_frames[i][0] + arraysize(sample_frames[i]));
@@ skipping 41 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),
-        "ABCD",
+    Module(module_base_address, "ABCD",

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

Please undo reformatting.

 #if defined(OS_WIN)
-        base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
+           base::FilePath(L"c:\\some\\path\\to\\chrome.exe")
 #else
-        base::FilePath("/some/path/to/chrome")
+           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) }
-  };
+  const Frame sample_frames[][1] = {{

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

Please undo reformatting.

+                                        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],
                   &sample_frames[i][0] + arraysize(sample_frames[i]));
   }
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingEnabled();
-  AppendProfiles(
-      Params(CallStackProfileMetricsProvider::PROCESS_STARTUP, true),
-      std::vector<Profile>(1, profile));
+  AppendProfiles(Params(CallStackProfileMetricsProvider::PROCESS_STARTUP, true),
+                 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_EQ(3, call_stack_profile.sample().size());
@@ skipping 17 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_address());
   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)));
+    profile.samples.push_back(
+        Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
     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(CallStackProfileMetricsProvider::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)));
+  profile.samples.push_back(
+      Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   AppendProfiles(
       Params(CallStackProfileMetricsProvider::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)));
+  profile.samples.push_back(
+      Sample(1, Frame(0x1000, Frame::kUnknownModuleIndex)));
 
   profile.profile_duration = base::TimeDelta::FromMilliseconds(100);
   profile.sampling_period = base::TimeDelta::FromMilliseconds(10);
 
   CallStackProfileMetricsProvider provider;
   provider.OnRecordingDisabled();
   AppendProfiles(
       Params(CallStackProfileMetricsProvider::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)));
+  profile.samples.push_back(
+      Sample(1, Frame(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(CallStackProfileMetricsProvider::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)));
+  profile.samples.push_back(
+      Sample(1, Frame(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(CallStackProfileMetricsProvider::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)));
+  profile.samples.push_back(
+      Sample(1, Frame(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(CallStackProfileMetricsProvider::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