Revert wstring patch (r29078 and follow up commits). It is causing failures o...

tools/memory_watcher/memory_watcher.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <windows.h>
 #include <tlhelp32.h>     // for CreateToolhelp32Snapshot()
 #include <map>
 
 #include "tools/memory_watcher/memory_watcher.h"
 #include "base/file_util.h"
@@ skipping 64 matching lines @@
   tmp_name += ".tmp";
   file_ = fopen(tmp_name.c_str(), "w+");
 }
 
 void MemoryWatcher::CloseLogFile() {
   if (file_ != NULL) {
     fclose(file_);
     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_));
   }
 }
 
 void MemoryWatcher::OnTrack(HANDLE heap, int32 id, int32 size) {
   // AllocationStack overrides new/delete to not allocate
   // from the main heap.
   AllocationStack* stack = new AllocationStack(size);
   {
     // Don't track zeroes.  It's a waste of time.
     if (size == 0) {
@@ skipping 101 matching lines @@
     std::string output;
     stack->ToString(&output);
     fprintf(file_, "%s", output.c_str());
     it++;
   }
   fprintf(file_, "Total Leaks:  %d\n", block_map_->size());
   fprintf(file_, "Total Stacks: %d\n", stack_map_->size());
   fprintf(file_, "Total Bytes:  %d\n", block_map_size_);
   CloseLogFile();
 }