summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-13 23:21:10 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-13 23:21:10 +0000
commit9993401b31ffd1b18f100982f8d75824019f9a11 (patch)
tree1c7dfc157e35326c35cddc334d166f8fb762b784 /chrome
parent611db6570104aab1de691be4a419e7288aac0c96 (diff)
downloadchromium_src-9993401b31ffd1b18f100982f8d75824019f9a11.zip
chromium_src-9993401b31ffd1b18f100982f8d75824019f9a11.tar.gz
chromium_src-9993401b31ffd1b18f100982f8d75824019f9a11.tar.bz2
Platform cleanup in worker_uitest.cc.
It compiles and links on Linux after this change, but doesn't pass, so I don't enable it. Review URL: http://codereview.chromium.org/149561 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20559 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/worker/worker_uitest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 0dbd012..f9707d0 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -219,7 +219,7 @@ void WorkerTest::RunLayoutTest(const std::string& test_case_file_name,
if (is_http_test)
new_test_url.reset(new GURL(
std::string("http://localhost:8080/") +
- UTF16ToUTF8(test_case_dir_.ToWStringHack()) +
+ WideToUTF8(test_case_dir_.ToWStringHack()) +
"/" +
test_case_file_name));
else
@@ -304,7 +304,7 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
worker_test_dir = worker_test_dir.AppendASCII("workers");
InitializeForLayoutTest(fast_test_dir, worker_test_dir, false);
- for (int i = 0; i < arraysize(kLayoutTestFiles); ++i)
+ for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
RunLayoutTest(kLayoutTestFiles[i], false);
}
@@ -325,7 +325,7 @@ TEST_F(WorkerTest, WorkerHttpLayoutTests) {
InitializeForLayoutTest(http_test_dir, worker_test_dir, true);
StartHttpServer(new_http_root_dir_);
- for (int i = 0; i < arraysize(kLayoutTestFiles); ++i)
+ for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
RunLayoutTest(kLayoutTestFiles[i], true);
StopHttpServer();
}
@@ -350,7 +350,7 @@ TEST_F(WorkerTest, WorkerXhrHttpLayoutTests) {
InitializeForLayoutTest(http_test_dir, worker_test_dir, true);
StartHttpServer(new_http_root_dir_);
- for (int i = 0; i < arraysize(kLayoutTestFiles); ++i)
+ for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
RunLayoutTest(kLayoutTestFiles[i], true);
StopHttpServer();
}