More memory stats code cleanup:...

chrome_frame/test/perf/chrome_frame_perftest.cc

 // Copyright (c) 2006-2009 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_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
 
 #include "chrome_tab.h"  // Generated from chrome_tab.idl.
 
 #include "base/file_util.h"
 #include "base/process_util.h"
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_bstr_win.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/test/chrome_process_util.h"
-#include "chrome/test/perf/mem_usage.h"
 #include "chrome/test/ui/ui_test.h"
 
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 
 const wchar_t kSilverlightControlKey[] =
     L"CLSID\\{DFEAF541-F3E1-4c24-ACAC-99C30715084A}\\InprocServer32";
 
 const wchar_t kFlashControlKey[] =
     L"CLSID\\{D27CDB6E-AE6D-11cf-96B8-444553540000}\\InprocServer32";
@@ skipping 536 matching lines @@
     chrome_frame_registrar_.reset(new ScopedChromeFrameRegistrar);
   }
 
   void RunTest(const char* test_name, char* urls[], int total_urls) {
     ASSERT_TRUE(urls != NULL);
     ASSERT_GT(total_urls, 0);
 
     // Record the initial CommitCharge.  This is a system-wide measurement,
     // so if other applications are running, they can create variance in this
     // test.
-    start_commit_charge_ = GetSystemCommitCharge();
+    start_commit_charge_ = base::GetSystemCommitCharge();
 
     for (int i = 0; i < total_urls; i++)
       urls_.push_back(urls[i]);
 
     std::string url;
     GetNextUrl(&url);
     ASSERT_TRUE(!url.empty());
 
     StartTest(url, test_name);
   }
@@ skipping 89 matching lines @@
   }
 
   void PrintResults(const char* test_name) {
     PrintMemoryUsageInfo(test_name);
     memory_consumption_map_.clear();
 
     // Added to give the OS some time to flush the used pages for the
     // chrome processes which would have exited by now.
     Sleep(200);
 
-    size_t end_commit_charge = GetSystemCommitCharge();
-    size_t commit_size = end_commit_charge - start_commit_charge_;
+    size_t end_commit_charge = base::GetSystemCommitCharge();
+    size_t commit_size = (end_commit_charge - start_commit_charge_) * 1024;
 
     std::string trace_name(test_name);
     trace_name.append("_cc");
 
     PrintResult("commit_charge", "", trace_name,
                 commit_size / 1024, "KB", true /* important */);
     printf("\n");
   }
 
   ChromeProcessList GetBrowserChildren() {
@@ skipping 52 matching lines @@
 
   // Should never get called.
   virtual void NavigateImpl(const std::string& url) = 0 {
     ASSERT_FALSE(false);
   }
 
   virtual void TestCompleted() = 0 {
     ASSERT_FALSE(false);
   }
 
-  // Holds the commit charge at the start of the memory test run.
+  // Holds the commit charge in KBytes at the start of the memory test run.
   size_t start_commit_charge_;
 
   // The index of the URL being tested.
   size_t current_url_index_;
 
   // The chrome browser pid.
   base::ProcessId browser_pid_;
 
   // Contains the list of urls against which the tests are run.
   std::vector<std::string> urls_;
@@ skipping 360 matching lines @@
   ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {silverlight_path};
 
   RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* important */, true);
 }