Revert 165685 - Revert 163638 - Adds units for all Chromium perf tests. These units are recorded in…

chrome/test/perf/perf_test.cc

 // Copyright (c) 2012 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 "chrome/test/perf/perf_test.h"
 
 #include <stdio.h>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 213 matching lines @@
         write_byte_r += write_byte;
         other_byte_r += other_byte;
         total_byte_r += total_byte;
       }
     }
 
     base::CloseProcessHandle(process_handle);
   }
 
   std::string t_name(test_name);
-  AppendResult(output, "read_op_b", "", "r_op_b" + t_name, read_op_b, "",
+  AppendResult(output, "read_op_b", "", "r_op_b" + t_name, read_op_b, "ops",
                false);
-  AppendResult(output, "write_op_b", "", "w_op_b" + t_name, write_op_b, "",
+  AppendResult(output, "write_op_b", "", "w_op_b" + t_name, write_op_b, "ops",
                false);
-  AppendResult(output, "other_op_b", "", "o_op_b" + t_name, other_op_b, "",
+  AppendResult(output, "other_op_b", "", "o_op_b" + t_name, other_op_b, "ops",
                false);
-  AppendResult(output, "total_op_b", "", "IO_op_b" + t_name, total_op_b, "",
+  AppendResult(output, "total_op_b", "", "IO_op_b" + t_name, total_op_b, "ops",
                false);
 
   AppendResult(output, "read_byte_b", "", "r_b" + t_name, read_byte_b, "kb",
                false);
   AppendResult(output, "write_byte_b", "", "w_b" + t_name, write_byte_b, "kb",
                false);
   AppendResult(output, "other_byte_b", "", "o_b" + t_name, other_byte_b, "kb",
                false);
   AppendResult(output, "total_byte_b", "", "IO_b" + t_name, total_byte_b, "kb",
                false);
 
-  AppendResult(output, "read_op_r", "", "r_op_r" + t_name, read_op_r, "",
+  AppendResult(output, "read_op_r", "", "r_op_r" + t_name, read_op_r, "ops",
                false);
-  AppendResult(output, "write_op_r", "", "w_op_r" + t_name, write_op_r, "",
+  AppendResult(output, "write_op_r", "", "w_op_r" + t_name, write_op_r, "ops",
                false);
-  AppendResult(output, "other_op_r", "", "o_op_r" + t_name, other_op_r, "",
+  AppendResult(output, "other_op_r", "", "o_op_r" + t_name, other_op_r, "ops",
                false);
-  AppendResult(output, "total_op_r", "", "IO_op_r" + t_name, total_op_r, "",
+  AppendResult(output, "total_op_r", "", "IO_op_r" + t_name, total_op_r, "ops",
                false);
 
   AppendResult(output, "read_byte_r", "", "r_r" + t_name, read_byte_r, "kb",
                false);
   AppendResult(output, "write_byte_r", "", "w_r" + t_name, write_byte_r, "kb",
                false);
   AppendResult(output, "other_byte_r", "", "o_r" + t_name, other_byte_r, "kb",
                false);
   AppendResult(output, "total_byte_r", "", "IO_r" + t_name, total_byte_r, "kb",
                false);
@@ skipping 136 matching lines @@
   AppendResult(output, "vm_size_final_t", "", "vm_size_f_t" + trace_name,
                total_virtual_size, "bytes",
                false /* not important */);
   AppendResult(output, "vm_rss_final_t", "", "vm_rss_f_t" + trace_name,
                total_working_set_size, "bytes",
                false /* not important */);
 #else
   NOTIMPLEMENTED();
 #endif
   AppendResult(output, "processes", "", "proc_" + trace_name,
-               chrome_processes.size(), "",
+               chrome_processes.size(), "count",
                false /* not important */);
 
   return output;
 }
 
 void PrintSystemCommitCharge(const std::string& test_name,
                              size_t charge,
                              bool important) {
   PrintSystemCommitCharge(stdout, test_name, charge, important);
 }
@@ skipping 10 matching lines @@
                                        size_t charge,
                                        bool important) {
   std::string trace_name(test_name);
   std::string output;
   AppendResult(output, "commit_charge", "", "cc" + trace_name, charge, "kb",
                important);
   return output;
 }
 
 }  // namespace perf_test