summaryrefslogtreecommitdiffstats
path: root/chrome/test/page_cycler
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 09:21:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-22 09:21:12 +0000
commitf31208dd5a80964dc4724f95efb5b50ec3026cae (patch)
treeaa61acbbaff5726183ab29d4acdb2106fbebf74e /chrome/test/page_cycler
parenta12a7c2ffb8ce5ab0c95c7fc69dae4db32913c5e (diff)
downloadchromium_src-f31208dd5a80964dc4724f95efb5b50ec3026cae.zip
chromium_src-f31208dd5a80964dc4724f95efb5b50ec3026cae.tar.gz
chromium_src-f31208dd5a80964dc4724f95efb5b50ec3026cae.tar.bz2
Replaced wsprintf() with printf().
I also added more tests like bloat, etc. They are working fine in ChromeOS. Formatted the cout to look better. Fixed comments. Patch by asharif@chromium.org. Original review: http://codereview.chromium.org/2733016 TEST=run the page_cycler tests and it should still work. BUG=none Review URL: http://codereview.chromium.org/2817023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler')
-rw-r--r--chrome/test/page_cycler/page_cycler_test.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index 1e3d080..1f5b49a 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -9,6 +9,7 @@
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_util.h"
+#include "base/sys_string_conversions.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
@@ -259,7 +260,9 @@ class PageCyclerTest : public UITest {
}
std::string trace_name = "t" + std::string(suffix);
- wprintf(L"\nPages: [%ls]\n", pages.c_str());
+
+ printf("Pages: [%s]\n", base::SysWideToNativeMB(pages).c_str());
+
PrintResultList(graph, "", trace_name, timings, "ms",
true /* important */);
}
@@ -463,6 +466,11 @@ PAGE_CYCLER_FILE_TESTS("dom", DomFile);
PAGE_CYCLER_FILE_TESTS("dhtml", DhtmlFile);
PAGE_CYCLER_FILE_TESTS("morejs", MorejsFile);
PAGE_CYCLER_EXTENSIONS_FILE_TESTS("morejs", MorejsFile);
+// added more tests here:
+PAGE_CYCLER_FILE_TESTS("alexa_us", Alexa_usFile);
+PAGE_CYCLER_FILE_TESTS("moz2", Moz2File);
+PAGE_CYCLER_FILE_TESTS("morejsnp", MorejsnpFile);
+PAGE_CYCLER_FILE_TESTS("bloat", BloatFile);
// http (localhost) tests
PAGE_CYCLER_HTTP_TESTS("moz", MozHttp);