diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 23:19:33 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-20 23:19:33 +0000 |
| commit | 2ee2da82416e6976b8f41b9a41549bfa128a0e09 (patch) | |
| tree | f85a683ae7996e44e25d8d4b5a6fb103ff5de765 /chrome | |
| parent | d4e3ac8dcfc9d5cef0cb2e762ee3415d214844b8 (diff) | |
| download | chromium_src-2ee2da82416e6976b8f41b9a41549bfa128a0e09.zip chromium_src-2ee2da82416e6976b8f41b9a41549bfa128a0e09.tar.gz chromium_src-2ee2da82416e6976b8f41b9a41549bfa128a0e09.tar.bz2 | |
Changed page_cycler to use sessionStorage instead of cookies for timing values.
Review URL: http://codereview.chromium.org/3145006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/test/page_cycler/page_cycler_test.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc index 23226ab..5e75158 100644 --- a/chrome/test/page_cycler/page_cycler_test.cc +++ b/chrome/test/page_cycler/page_cycler_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -162,6 +162,7 @@ class PageCyclerTest : public UITest { PageCyclerTest() : print_times_only_(false) { show_window_ = true; + dom_automation_enabled_ = true; const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); num_test_iterations_ = TEST_ITERATIONS; @@ -245,6 +246,12 @@ class PageCyclerTest : public UITest { 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()); } |