Unbreak unit tests. Revert r7564.

chrome/browser/download/download_manager_unittest.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 <string>
 
 #include "base/logging.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class DownloadManagerTest : public testing::Test {
  public:
   DownloadManagerTest() {
     download_manager_ = new DownloadManager();
     download_util::InitializeExeTypes(&download_manager_->exe_types_);
   }
 
   void GetGeneratedFilename(const std::string& content_disposition,
                             const std::wstring& url,
                             const std::string& mime_type,
-                            std::wstring* generated_name_string) {
+                            std::wstring* generated_name) {
     DownloadCreateInfo info;
     info.content_disposition = content_disposition;
     info.url = url;
     info.mime_type = mime_type;
-    FilePath generated_name;
-    download_manager_->GenerateFilename(&info, &generated_name);
-    *generated_name_string = generated_name.ToWStringHack();
+    download_manager_->GenerateFilename(&info, generated_name);
   }
 
  protected:
   scoped_refptr<DownloadManager> download_manager_;
   MessageLoopForUI message_loop_;
 
   DISALLOW_EVIL_CONSTRUCTORS(DownloadManagerTest);
 };
 
 static const struct {
@@ skipping 278 matching lines @@
   for (int i = 0; i < arraysize(kGeneratedFiles); ++i) {
     std::wstring file_name;
     GetGeneratedFilename(kGeneratedFiles[i].disposition,
                          kGeneratedFiles[i].url,
                          kGeneratedFiles[i].mime_type,
                          &file_name);
     EXPECT_EQ(kGeneratedFiles[i].expected_name, file_name);
   }
 }