diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 03:41:02 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 03:41:02 +0000 |
| commit | 6ec54c1e86aa5d29c7223a86acbfa850be39c806 (patch) | |
| tree | 8c0be0238c2f35646c3545060375a9032c50b04d /chrome_frame/test_utils.cc | |
| parent | 89f580b14355e7342cff030747d12ec18f8ca012 (diff) | |
| download | chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.zip chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.tar.gz chromium_src-6ec54c1e86aa5d29c7223a86acbfa850be39c806.tar.bz2 | |
Revert wstring patch (r29078 and follow up commits). It is causing failures on the buildbots.
TBR=nsylvain
Review URL: http://codereview.chromium.org/280004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test_utils.cc')
| -rw-r--r-- | chrome_frame/test_utils.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc index abfdbee..2d47c71 100644 --- a/chrome_frame/test_utils.cc +++ b/chrome_frame/test_utils.cc @@ -15,18 +15,17 @@ // Statics -FilePath ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() { - FilePath build_path; +std::wstring ScopedChromeFrameRegistrar::GetChromeFrameBuildPath() { + std::wstring build_path; PathService::Get(chrome::DIR_APP, &build_path); - build_path = build_path.Append(L"servers"). - Append(L"npchrome_tab.dll"); + file_util::AppendToPath(&build_path, L"servers\\npchrome_tab.dll"); file_util::PathExists(build_path); return build_path; } void ScopedChromeFrameRegistrar::RegisterDefaults() { - FilePath dll_path = GetChromeFrameBuildPath(); - RegisterAtPath(dll_path.value()); + std::wstring dll_path_ = GetChromeFrameBuildPath(); + RegisterAtPath(dll_path_); } void ScopedChromeFrameRegistrar::RegisterAtPath( @@ -57,7 +56,7 @@ void ScopedChromeFrameRegistrar::RegisterAtPath( // Non-statics ScopedChromeFrameRegistrar::ScopedChromeFrameRegistrar() { - original_dll_path_ = GetChromeFrameBuildPath().ToWStringHack(); + original_dll_path_ = GetChromeFrameBuildPath(); RegisterChromeFrameAtPath(original_dll_path_); } |