More memory stats code cleanup:...

chrome/test/memory_test/memory_test.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 "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"
 #include "base/string_util.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/chrome_process_util.h"
 #include "chrome/test/ui/ui_test.h"
-#include "chrome/test/perf/mem_usage.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 static const FilePath::CharType kTempDirName[] =
     FILE_PATH_LITERAL("memory_test_profile");
 
 class MemoryTest : public UITest {
@@ skipping 96 matching lines @@
   // new tab.
   // <PAUSE> is a special URL that informs the loop to pause before proceeding
   // to the next URL.
   void RunTest(const char* test_name, int num_target_tabs) {
     std::string* urls;
     size_t urls_length = GetUrlList(&urls);
 
     // Record the initial CommitCharge.  This is a system-wide measurement,
     // so if other applications are running, they can create variance in this
     // test.
-    size_t start_size = GetSystemCommitCharge();
+    size_t start_size = base::GetSystemCommitCharge();
 
     // Cycle through the URLs.
     scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
     int active_window = 0;  // The index of the window we are currently using.
     scoped_refptr<TabProxy> tab(window->GetActiveTab());
     int expected_tab_count = 1;
     for (unsigned counter = 0; counter < urls_length; ++counter) {
       std::string url = urls[counter];
 
       if (url == "<PAUSE>") {  // Special command to delay on this page
@@ skipping 65 matching lines @@
                                     &timed_out);
       if (timed_out)
         printf("warning: %s timed out!\n", urls[counter].c_str());
 
       // TODO(mbelshe): Bug 2953
       // The automation crashes periodically if we cycle too quickly.
       // To make these tests more reliable, slowing them down a bit.
       PlatformThread::Sleep(100);
     }
 
-    size_t stop_size = GetSystemCommitCharge();
-    PrintResults(test_name, stop_size - start_size);
+    size_t stop_size = base::GetSystemCommitCharge();
+    PrintResults(test_name, (stop_size - start_size) / 1024);
   }
 
   void PrintResults(const char* test_name, size_t commit_size) {
     PrintMemoryUsageInfo(test_name);
     std::string trace_name(test_name);
     trace_name.append("_cc");
 
     PrintResult("commit_charge", "", trace_name,
                 commit_size / 1024, "kb", true /* important */);
   }
@@ skipping 409 matching lines @@
 TEST_F(GeneralMixMemoryTest, TwelveTabTest) {
   RunTest("12t", 12);
 }
 
 // Commented out until the recorded cache data is added.
 //TEST_F(MembusterMemoryTest, Windows) {
 //  RunTest("membuster", 0);
 //}
 
 }  // namespace