summaryrefslogtreecommitdiffstats
path: root/chrome/test/perf
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-28 21:58:18 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-28 21:58:18 +0000
commitecaae0a04cad41f2bc59a2a5671d6f9cdf82de99 (patch)
tree37a78aa07506eaf4d3183a3e6bb47ac40bdb95ff /chrome/test/perf
parent4afc8d67c4d6491fe1e1d60d17fa6651e861e795 (diff)
downloadchromium_src-ecaae0a04cad41f2bc59a2a5671d6f9cdf82de99.zip
chromium_src-ecaae0a04cad41f2bc59a2a5671d6f9cdf82de99.tar.gz
chromium_src-ecaae0a04cad41f2bc59a2a5671d6f9cdf82de99.tar.bz2
Revert 202620 "Collect tab timing information for use in telemen..."
> Collect tab timing information for use in telementry-based startup tests > > Motivation: Data collection exposed in this CL is needed by upcoming startup tests we're writing using Telemtry. > > Expose a new window.statsCollectionController object to JS and move existing histogram reading code into it since that seemed misplaced in DOMAutomationController. > > Add a new --enable-stats-collection-bindings to activate said object. > > Example usage in telemtry: > with browser.Create() as b: > b.tabs[0].Navigate("http://www.google.com") > b.tabs[0].WaitForDocumentReadyStateToBeComplete() > print b.tabs[0].EvaluateJavaScript('statsCollectionController.tabLoadTiming()') > > BUG=None > > Review URL: https://chromiumcodereview.appspot.com/12389073 TBR=jeremy@chromium.org Review URL: https://codereview.chromium.org/16160006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
-rw-r--r--chrome/test/perf/page_cycler_test.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc
index ce82558..9d13000 100644
--- a/chrome/test/perf/page_cycler_test.cc
+++ b/chrome/test/perf/page_cycler_test.cc
@@ -130,7 +130,6 @@ class PageCyclerTest : public UIPerfTest {
num_test_iterations_(kTestIterations) {
show_window_ = true;
dom_automation_enabled_ = true;
- stats_collection_controller_enabled_ = true;
const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
if (parsed_command_line.HasSwitch(switches::kPageCyclerIterations)) {
@@ -279,8 +278,8 @@ class PageCyclerTest : public UIPerfTest {
ASSERT_TRUE(tab->ExecuteAndExtractString(
std::wstring(),
L"window.domAutomationController.send("
- L"window.statsCollectionController.getHistogram ? "
- L"window.statsCollectionController.getHistogram(\"" +
+ L"window.domAutomationController.getHistogram ? "
+ L"window.domAutomationController.getHistogram(\"" +
base::SysUTF8ToWide(name) + L"\") : '')",
&whistogram));
std::string histogram = base::SysWideToNativeMB(whistogram);