summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-02 17:43:01 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-02 17:43:01 +0000
commit32c5b622b862467963b4a250e70355e1f5cec9e5 (patch)
tree924d711dd06fbffb6144d00973f845d0d62abc01 /chrome
parent419523b4b0778ee5c26fe35a62230cc694a5eccf (diff)
downloadchromium_src-32c5b622b862467963b4a250e70355e1f5cec9e5.zip
chromium_src-32c5b622b862467963b4a250e70355e1f5cec9e5.tar.gz
chromium_src-32c5b622b862467963b4a250e70355e1f5cec9e5.tar.bz2
Revert 159668 - This broke the reference page cyclers
Original description: Page cyclers: output memory histograms (approach: expose JS object) This CL makes the chrome browser expose a JS object for retrieving histograms if a command line flag is passed. Page cycler then gets the histograms by executing JS via the test automation API. BUG=145352 Review URL: https://chromiumcodereview.appspot.com/10905073 TBR=marja@chromium.org Review URL: https://codereview.chromium.org/11027020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159724 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/test/perf/page_cycler_test.cc26
1 files changed, 0 insertions, 26 deletions
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc
index 1d5dc5d..65b3621 100644
--- a/chrome/test/perf/page_cycler_test.cc
+++ b/chrome/test/perf/page_cycler_test.cc
@@ -253,7 +253,6 @@ class PageCyclerTest : public UIPerfTest {
PrintIOPerfInfo(suffix);
perf_test::PrintSystemCommitCharge(suffix, stop_size - start_size,
false /* not important */);
- ASSERT_NO_FATAL_FAILURE(PrintMemoryHistograms());
}
std::string trace_name = "t" + std::string(suffix);
@@ -268,31 +267,6 @@ class PageCyclerTest : public UIPerfTest {
RunTestWithSuffix(graph, name, use_http, "");
}
- private:
- void PrintMemoryHistogram(const std::string& name) {
- 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(\"" +
- 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());
- }
-
- void PrintMemoryHistograms() {
- ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
- "V8.MemoryExternalFragmentationTotal"));
- ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
- "V8.MemoryHeapSampleTotalCommitted"));
- ASSERT_NO_FATAL_FAILURE(PrintMemoryHistogram(
- "V8.MemoryHeapSampleTotalUsed"));
- }
-
protected:
bool print_times_only_;