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

chrome/browser/jumplist.cc

 // Copyright (c) 2006-2009 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 "chrome/browser/jumplist.h"
 
 #include <windows.h>
 #include <shobjidl.h>
 #include <propkey.h>
 #include <propvarutil.h>
@@ skipping 468 matching lines @@
 
   // Items in the "Recently Closed" category of the application JumpList.
   ShellLinkItemList recently_closed_pages_;
 };
 
 void JumpListUpdateTask::Run() {
   // Delete the directory which contains old icon files, rename the current
   // icon directory, and create a new directory which contains new JumpList
   // icon files.
   std::wstring icon_dir_old(icon_dir_ + L"Old");
-  if (file_util::PathExists(FilePath::FromWStringHack(icon_dir_old)))
+  if (file_util::PathExists(icon_dir_old))
     file_util::Delete(icon_dir_old, true);
-  file_util::Move(FilePath::FromWStringHack(icon_dir_),
-                  FilePath::FromWStringHack(icon_dir_old));
+  file_util::Move(icon_dir_, icon_dir_old);
   file_util::CreateDirectory(icon_dir_);
 
   // Create temporary icon files for shortcuts in the "Most Visited" category.
   for (ShellLinkItemList::const_iterator item = most_visited_pages_.begin();
        item != most_visited_pages_.end(); ++item) {
     SkBitmap icon_bitmap;
     if ((*item)->data().get() &&
         gfx::PNGCodec::Decode(&(*item)->data()->data, &icon_bitmap)) {
       std::wstring icon_path;
       if (CreateIconFile(icon_bitmap, icon_dir_, &icon_path))
@@ skipping 229 matching lines @@
                                            most_visited_pages_,
                                            recently_closed_pages_);
   MessageLoop* file_loop = g_browser_process->file_thread()->message_loop();
   if (file_loop)
     file_loop->PostTask(FROM_HERE, icon_task);
 
   // Delete all items in these lists since we don't need these lists any longer.
   most_visited_pages_.clear();
   recently_closed_pages_.clear();
 }