Normalizing source file names before calculating hash

chrome/browser/metrics/metrics_log_unittest.cc

Index: chrome/browser/metrics/metrics_log_unittest.cc
diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
index 9f3ca7cb6f753e9a8329a6ce4d68d4f53e26de0e..b81c92a252a94de4d1f48900004fb1ecaa3c2622 100644
--- a/chrome/browser/metrics/metrics_log_unittest.cc
+++ b/chrome/browser/metrics/metrics_log_unittest.cc
@@ -474,7 +474,7 @@ TEST_F(MetricsLogTest, RecordProfilerData) {
     ProcessDataSnapshot process_data;
     process_data.process_id = 177;
     process_data.tasks.push_back(TaskSnapshot());
-    process_data.tasks.back().birth.location.file_name = "file";
+    process_data.tasks.back().birth.location.file_name = "a/b/file.h";
     process_data.tasks.back().birth.location.function_name = "function";
     process_data.tasks.back().birth.location.line_number = 1337;
     process_data.tasks.back().birth.thread_name = "birth_thread";
@@ -487,7 +487,7 @@ TEST_F(MetricsLogTest, RecordProfilerData) {
     process_data.tasks.back().death_data.queue_duration_sample = 3;
     process_data.tasks.back().death_thread_name = "Still_Alive";
     process_data.tasks.push_back(TaskSnapshot());
-    process_data.tasks.back().birth.location.file_name = "file2";
+    process_data.tasks.back().birth.location.file_name = "c\\d\\file2";
     process_data.tasks.back().birth.location.function_name = "function2";
     process_data.tasks.back().birth.location.line_number = 1773;
     process_data.tasks.back().birth.thread_name = "birth_thread2";
@@ -511,7 +511,7 @@ TEST_F(MetricsLogTest, RecordProfilerData) {
 
     const ProfilerEventProto::TrackedObject* tracked_object =
         &log.uma_proto().profiler_event(0).tracked_object(0);
-    EXPECT_EQ(GG_UINT64_C(10123486280357988687),
+    EXPECT_EQ(GG_UINT64_C(5891889577137156145),
               tracked_object->source_file_name_hash());
     EXPECT_EQ(GG_UINT64_C(13962325592283560029),
               tracked_object->source_function_name_hash());
@@ -565,6 +565,19 @@ TEST_F(MetricsLogTest, RecordProfilerData) {
     process_data.tasks.back().death_data.queue_duration_max = 105;
     process_data.tasks.back().death_data.queue_duration_sample = 103;
     process_data.tasks.back().death_thread_name = "death_thread3";
+    process_data.tasks.push_back(TaskSnapshot());
+    process_data.tasks.back().birth.location.file_name = "";
+    process_data.tasks.back().birth.location.function_name = "";
+    process_data.tasks.back().birth.location.line_number = 7331;
+    process_data.tasks.back().birth.thread_name = "";
+    process_data.tasks.back().death_data.count = 137;
+    process_data.tasks.back().death_data.run_duration_sum = 131;
+    process_data.tasks.back().death_data.run_duration_max = 117;
+    process_data.tasks.back().death_data.run_duration_sample = 113;
+    process_data.tasks.back().death_data.queue_duration_sum = 108;
+    process_data.tasks.back().death_data.queue_duration_max = 105;
+    process_data.tasks.back().death_data.queue_duration_sample = 103;

[Ilya Sherman, 2014/03/29 01:06:49]

I would prefer if you did not repeat the constants from above here.  I
originally chose all of these constants to be unique.  IMO, it might even be
better to just write this as a separate test case, where you don't set any of
the numeric constants at all, and only verify that the names are hashed as you'd
expect.  (Assuming I'm correctly understanding the purpose of this test.)

[vadimt, 2014/03/31 18:10:14]

Yeah, I could add a separate test. But everything else is tested altogether, and
I'm not motivated to break this structure.
I've changed constants, though.

If you feel very strong about creating an additional test, please let me know.

+    process_data.tasks.back().death_thread_name = "";
 
     log.RecordProfilerData(process_data, content::PROCESS_TYPE_RENDERER);
     ASSERT_EQ(1, log.uma_proto().profiler_event_size());
@@ -572,7 +585,7 @@ TEST_F(MetricsLogTest, RecordProfilerData) {
               log.uma_proto().profiler_event(0).profile_type());
     EXPECT_EQ(ProfilerEventProto::WALL_CLOCK_TIME,
               log.uma_proto().profiler_event(0).time_source());
-    ASSERT_EQ(3, log.uma_proto().profiler_event(0).tracked_object_size());
+    ASSERT_EQ(4, log.uma_proto().profiler_event(0).tracked_object_size());
 
     const ProfilerEventProto::TrackedObject* tracked_object =
         &log.uma_proto().profiler_event(0).tracked_object(2);
@@ -593,6 +606,25 @@ TEST_F(MetricsLogTest, RecordProfilerData) {
     EXPECT_EQ(1177U, tracked_object->process_id());
     EXPECT_EQ(ProfilerEventProto::TrackedObject::RENDERER,
               tracked_object->process_type());
+
+    tracked_object = &log.uma_proto().profiler_event(0).tracked_object(3);
+    EXPECT_EQ(GG_UINT64_C(15284527576400310788),
+              tracked_object->source_file_name_hash());
+    EXPECT_EQ(GG_UINT64_C(15284527576400310788),
+              tracked_object->source_function_name_hash());
+    EXPECT_EQ(7331, tracked_object->source_line_number());
+    EXPECT_EQ(GG_UINT64_C(15284527576400310788),
+              tracked_object->birth_thread_name_hash());
+    EXPECT_EQ(137, tracked_object->exec_count());
+    EXPECT_EQ(131, tracked_object->exec_time_total());
+    EXPECT_EQ(113, tracked_object->exec_time_sampled());
+    EXPECT_EQ(108, tracked_object->queue_time_total());
+    EXPECT_EQ(103, tracked_object->queue_time_sampled());
+    EXPECT_EQ(GG_UINT64_C(15284527576400310788),
+              tracked_object->exec_thread_name_hash());
+    EXPECT_EQ(1177U, tracked_object->process_id());
+    EXPECT_EQ(ProfilerEventProto::TrackedObject::RENDERER,
+              tracked_object->process_type());
   }
 }