Unbreak unit tests. Revert r7564.

chrome/browser/download/save_package.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 "chrome/browser/download/save_package.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 159 matching lines @@
     return false;
   }
 
   file_manager_ = rdh->save_file_manager();
   if (!file_manager_) {
     NOTREACHED();
     return false;
   }
 
   // Create the fake DownloadItem and display the view.
-  download_ = new DownloadItem(1,
-      FilePath::FromWStringHack(saved_main_file_path_), 0, page_url_,
-      FilePath(), Time::Now(), 0, -1, -1, false);
+  download_ = new DownloadItem(1, saved_main_file_path_, 0, page_url_,
+                               std::wstring(), Time::Now(), 0, -1, -1, false);
   download_->set_manager(web_contents_->profile()->GetDownloadManager());
   DownloadShelfView* shelf = web_contents_->GetDownloadShelfView();
   shelf->AddDownloadView(new DownloadItemView(
       download_, shelf, new SavePageModel(this, download_)));
   web_contents_->SetDownloadShelfVisible(true);
 
   // Check save type and process the save page job.
   if (save_type_ == SAVE_AS_COMPLETE_HTML) {
     // Get directory
     DCHECK(!saved_main_directory_path_.empty());
@@ skipping 869 matching lines @@
 
   if (available_length > dir_path_length) {
     *pure_file_name =
         pure_file_name->substr(0, available_length - dir_path_length);
     return true;
   } else {
     pure_file_name->clear();
     return false;
   }
 }