diff options
author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 01:03:33 +0000 |
---|---|---|
committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-17 01:03:33 +0000 |
commit | 118fcddea5943ebc56fd3d6da4285651239408de (patch) | |
tree | 7fcad20b073da1f54c0b780969c8554369295a72 /chrome/test/page_cycler/page_cycler_test.cc | |
parent | 680d201ec4f79642cca4073145fdb86e809eb03c (diff) | |
download | chromium_src-118fcddea5943ebc56fd3d6da4285651239408de.zip chromium_src-118fcddea5943ebc56fd3d6da4285651239408de.tar.gz chromium_src-118fcddea5943ebc56fd3d6da4285651239408de.tar.bz2 |
Update page_cycler to use sessionStorage.
Patch from Ahmad Sharif <asharif@chromium.org>.
This was landed previously as r56932 and reverted in
r57445. Previous landing showed some flakiness/failures
in the DOM automation framework. Relanding to verify
if this is fixed or still broken.
BUG=53491
TEST=page cyclers stay green
Review URL: http://codereview.chromium.org/5955002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler/page_cycler_test.cc')
-rw-r--r-- | chrome/test/page_cycler/page_cycler_test.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc index d6952b4..43b30a9 100644 --- a/chrome/test/page_cycler/page_cycler_test.cc +++ b/chrome/test/page_cycler/page_cycler_test.cc @@ -163,6 +163,7 @@ class PageCyclerTest : public UIPerfTest { PageCyclerTest() : print_times_only_(false) { show_window_ = true; + dom_automation_enabled_ = true; const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); num_test_iterations_ = kTestIterations; @@ -246,6 +247,14 @@ class PageCyclerTest : public UIPerfTest { pages->assign(UTF8ToWide(cookie)); ASSERT_FALSE(pages->empty()); ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_timings", &cookie)); + + std::wstring wcookie; + ASSERT_TRUE(tab->ExecuteAndExtractString(L"", + L"window.domAutomationController.send(" + L"JSON.stringify(__get_timings()));", + &wcookie)); + cookie = base::SysWideToNativeMB(wcookie); + timings->assign(cookie); ASSERT_FALSE(timings->empty()); } |