diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 02:54:56 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 02:54:56 +0000 |
| commit | d3c1ea6b14c108eaec919200e8bc5997a681a42b (patch) | |
| tree | 51be7f0ba8eb41374571e083c77d521f709e77dd /chrome_frame | |
| parent | 18a9dda7862cd220ce0a7e11c08cdc464c0817db (diff) | |
| download | chromium_src-d3c1ea6b14c108eaec919200e8bc5997a681a42b.zip chromium_src-d3c1ea6b14c108eaec919200e8bc5997a681a42b.tar.gz chromium_src-d3c1ea6b14c108eaec919200e8bc5997a681a42b.tar.bz2 | |
Try to fix chrome frame build again.
TBR=nsylvain
Review URL: http://codereview.chromium.org/276040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29083 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/perf/chrome_frame_perftest.cc | 6 | ||||
| -rw-r--r-- | chrome_frame/test_utils.cc | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index 79bbd7b..c896fa4 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -621,7 +621,8 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { file_util::AppendToPath(&chrome_exe_test_path, chrome::kBrowserProcessExecutableName); - if (!file_util::PathExists(chrome_exe_test_path)) { + if (!file_util::PathExists( + FilePath::FromWStringHack(chrome_exe_test_path))) { file_util::UpOneDirectory(&chrome_exe_path); chrome_exe_test_path = chrome_exe_path; @@ -629,7 +630,8 @@ class ChromeFrameMemoryTest : public ChromeFramePerfTestBase { chrome::kBrowserProcessExecutableName); } - EXPECT_TRUE(file_util::PathExists(chrome_exe_test_path)); + EXPECT_TRUE( + file_util::PathExists(FilePath::FromWStringHack(chrome_exe_test_path))); return chrome_exe_path; } diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index 2d47c71..abfdbee 100644 --- a/chrome_frame/test_utils.cc +++ b/chrome_frame/test_utils.cc @@ -15,17 +15,18 @@ // Statics -std::wstring ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() { - std::wstring build_path; +FilePath ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() { + FilePath build_path; PathService::Get(chrome::DIR_APP, &build_path); - file_util::AppendToPath(&build_path, L"servers\\npchrome_tab.dll"); + build_path = build_path.Append(L"servers"). + Append(L"npchrome_tab.dll"); file_util::PathExists(build_path); return build_path; } void ScopedChromeFrameRegistrar::RegisterDefaults() { - std::wstring dll_path_ = GetChromeFrameBuildPath(); - RegisterAtPath(dll_path_); + FilePath dll_path = GetChromeFrameBuildPath(); + RegisterAtPath(dll_path.value()); } void ScopedChromeFrameRegistrar::RegisterAtPath( @@ -56,7 +57,7 @@ void ScopedChromeFrameRegistrar::RegisterAtPath( // Non-statics ScopedChromeFrameRegistrar::ScopedChromeFrameRegistrar() { - original_dll_path_ = GetChromeFrameBuildPath(); + original_dll_path_ = GetChromeFrameBuildPath().ToWStringHack(); RegisterChromeFrameAtPath(original_dll_path_); } |