summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 16:56:38 +0000
committerlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-28 16:56:38 +0000
commit0bd59865c5716c150914a74226a40de808d9f419 (patch)
treec3731b30bf86d477577a4cd6bc8a4ad0e844a6bd /net
parent0df165f0f1ea596434d547d9ef387a9fb486bb41 (diff)
downloadchromium_src-0bd59865c5716c150914a74226a40de808d9f419.zip
chromium_src-0bd59865c5716c150914a74226a40de808d9f419.tar.gz
chromium_src-0bd59865c5716c150914a74226a40de808d9f419.tar.bz2
Review URL: http://codereview.chromium.org/3402032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/test/python_utils.cc2
-rw-r--r--net/test/python_utils_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc
index 5f574fe..438c3d7 100644
--- a/net/test/python_utils.cc
+++ b/net/test/python_utils.cc
@@ -40,7 +40,7 @@ bool GetPythonRunTime(FilePath* dir) {
#if defined(OS_WIN)
if (!PathService::Get(base::DIR_SOURCE_ROOT, dir))
return false;
- *dir = FilePath(FILE_PATH_LITERAL("third_party"))
+ *dir = dir->Append(FILE_PATH_LITERAL("third_party"))
.Append(FILE_PATH_LITERAL("python_24"))
.Append(FILE_PATH_LITERAL("python.exe"));
#elif defined(OS_POSIX)
diff --git a/net/test/python_utils_unittest.cc b/net/test/python_utils_unittest.cc
index 4026840..f0060fe 100644
--- a/net/test/python_utils_unittest.cc
+++ b/net/test/python_utils_unittest.cc
@@ -43,7 +43,7 @@ TEST(PythonUtils, PythonRunTime) {
EXPECT_TRUE(GetPythonRunTime(&dir));
#if defined(OS_WIN)
EXPECT_NE(std::wstring::npos,
- dir.value().find(L"third_party\\python_24\\python.exe"));
+ dir.value().find(L"\\third_party\\python_24\\python.exe"));
#elif defined(OS_POSIX)
EXPECT_NE(std::string::npos, dir.value().find("python"));
#endif