summaryrefslogtreecommitdiffstats
path: root/tools/memory_watcher
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 03:41:02 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 03:41:02 +0000
commit6ec54c1e86aa5d29c7223a86acbfa850be39c806 (patch)
tree8c0be0238c2f35646c3545060375a9032c50b04d /tools/memory_watcher
parent89f580b14355e7342cff030747d12ec18f8ca012 (diff)
downloadchromium_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 'tools/memory_watcher')
-rw-r--r--tools/memory_watcher/memory_watcher.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/memory_watcher/memory_watcher.cc b/tools/memory_watcher/memory_watcher.cc
index a240b92..0d05fcb 100644
--- a/tools/memory_watcher/memory_watcher.cc
+++ b/tools/memory_watcher/memory_watcher.cc
@@ -82,8 +82,7 @@ void MemoryWatcher::CloseLogFile() {
file_ = NULL;
std::wstring tmp_name = ASCIIToWide(file_name_);
tmp_name += L".tmp";
- file_util::Move(FilePath::FromWStringHack(tmp_name),
- FilePath::FromWStringHack(ASCIIToWide(file_name_)));
+ file_util::Move(tmp_name, ASCIIToWide(file_name_));
}
}