summaryrefslogtreecommitdiffstats
path: root/chrome/test/page_cycler
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-02 00:56:57 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-02 00:56:57 +0000
commit4b68e0d50c4a69b91a384b698a96f6a51ca7241f (patch)
treea11dc1b6baf8d2e1d1c3d8b7930fb9ca0cec46eb /chrome/test/page_cycler
parent82d10b14f9b4150ce1e154629dec9dcddadcf272 (diff)
downloadchromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.zip
chromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.tar.gz
chromium_src-4b68e0d50c4a69b91a384b698a96f6a51ca7241f.tar.bz2
Yet more deprecation of the wstring version of PathService::Get() for UI tests.
Review URL: http://codereview.chromium.org/99298 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler')
-rw-r--r--chrome/test/page_cycler/page_cycler_test.cc11
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc
index a8826ee..308581a 100644
--- a/chrome/test/page_cycler/page_cycler_test.cc
+++ b/chrome/test/page_cycler/page_cycler_test.cc
@@ -4,7 +4,7 @@
#include "base/basictypes.h"
#include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/file_path.h"
#include "base/path_service.h"
#include "base/process_util.h"
#include "base/string_util.h"
@@ -149,8 +149,6 @@ class PageCyclerTest : public UITest {
PrintResult("total_byte", chrome_name,
"IO_b" + chrome_name + test_name,
total, "kb", true /* important */);
-
-
}
base::CloseProcessHandle(process_handle);
@@ -171,7 +169,6 @@ class PageCyclerTest : public UITest {
size_t current_working_set_size;
if (GetMemoryInfo(*it, &peak_virtual_size, &current_virtual_size,
&peak_working_set_size, &current_working_set_size)) {
-
std::string chrome_name = (*it == browser_process_pid) ? "_b" : "_r";
std::string trace_name(test_name);
@@ -224,10 +221,10 @@ class PageCyclerReferenceTest : public PageCyclerTest {
// override the browser directory that is used by UITest::SetUp to cause it
// to use the reference build instead.
void SetUp() {
- std::wstring dir;
+ FilePath dir;
PathService::Get(chrome::DIR_TEST_TOOLS, &dir);
- file_util::AppendToPath(&dir, L"reference_build");
- file_util::AppendToPath(&dir, L"chrome");
+ dir = dir.AppendASCII("reference_build");
+ dir = dir.AppendASCII("chrome");
browser_directory_ = dir;
UITest::SetUp();
}