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

chrome/test/perf/page_cycler_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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 251 matching lines @@
 
     perf_test::PrintResultList(graph, "", trace_name, timings, "ms",
                                true /* important */);
   }
 
   void RunTest(const char* graph, const char* name, bool use_http) {
     RunTestWithSuffix(graph, name, use_http, "");
   }
 
  private:
-  void PrintMemoryHistogram(const std::string& name) {
+  void PrintMemoryHistogram(const std::string& name,
+                            const std::string& units) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_TRUE(tab.get());
     std::wstring whistogram;
     ASSERT_TRUE(tab->ExecuteAndExtractString(
         L"",
         L"window.domAutomationController.send("
         L"window.domAutomationController.getHistogram ? "
         L"window.domAutomationController.getHistogram(\"" +
         base::SysUTF8ToWide(name) + L"\") : '')",
         &whistogram));
     std::string histogram = base::SysWideToNativeMB(whistogram);
-    printf("HISTOGRAM %s: %s = %s\n",
-           name.c_str(), name.c_str(), histogram.c_str());
+    printf("HISTOGRAM %s: %s = %s %s\n",
+           name.c_str(), name.c_str(), histogram.c_str(), units.c_str());
   }
 
   void PrintMemoryHistograms() {
     ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
-        "V8.MemoryExternalFragmentationTotal"));
+        "V8.MemoryExternalFragmentationTotal", "percent"));
     ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
-        "V8.MemoryHeapSampleTotalCommitted"));
+        "V8.MemoryHeapSampleTotalCommitted", "kb"));
     ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
-        "V8.MemoryHeapSampleTotalUsed"));
+        "V8.MemoryHeapSampleTotalUsed", "kb"));
   }
 
  protected:
   bool print_times_only_;
 
  private:
   int num_test_iterations_;
 };
 
 class PageCyclerReferenceTest : public PageCyclerTest {
@@ skipping 352 matching lines @@
 PAGE_CYCLER_DATABASE_TESTS("delete-transactions",
                            DeleteTransactions);
 PAGE_CYCLER_DATABASE_TESTS("pseudo-random-transactions",
                            PseudoRandomTransactions);
 #endif
 
 // Indexed DB tests.
 PAGE_CYCLER_IDB_TESTS("basic_insert", BasicInsert);
 
 }  // namespace