Unbreak unit tests. Revert r7564.

chrome/browser/download/download_file.h

 // 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.
 //
 // Objects that handle file operations for downloads, on the download thread.
 //
 // The DownloadFileManager owns a set of DownloadFile objects, each of which
 // represent one in progress download and performs the disk IO for that
 // download. The DownloadFileManager itself is a singleton object owned by the
 // ResourceDispatcherHost.
@@ skipping 35 matching lines @@
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/thread.h"
 #include "base/timer.h"
 #include "chrome/browser/history/download_types.h"
 
 class DownloadManager;
-class FilePath;
 class GURL;
 class MessageLoop;
 class ResourceDispatcherHost;
 class URLRequestContext;
 
 // DownloadBuffer --------------------------------------------------------------
 
 // This container is created and populated on the io_thread, and passed to the
 // file_thread for writing. In order to avoid flooding the file_thread with too
 // many small write messages, each write is appended to the DownloadBuffer while
@@ skipping 20 matching lines @@
 
   bool Initialize();
 
   // Write a new chunk of data to the file. Returns true on success.
   bool AppendDataToFile(const char* data, int data_len);
 
   // Abort the download and automatically close the file.
   void Cancel();
 
   // Rename the download file. Returns 'true' if the rename was successful.
-  bool Rename(const FilePath& full_path);
+  bool Rename(const std::wstring& full_path);
 
   // Accessors.
   int64 bytes_so_far() const { return bytes_so_far_; }
   int id() const { return id_; }
-  FilePath full_path() const { return full_path_; }
+  std::wstring full_path() const { return full_path_; }
   int render_process_id() const { return render_process_id_; }
   int render_view_id() const { return render_view_id_; }
   int request_id() const { return request_id_; }
   bool path_renamed() const { return path_renamed_; }
   bool in_progress() const { return file_ != NULL; }
   void set_in_progress(bool in_progress) { in_progress_ = in_progress; }
 
  private:
   // Open or Close the OS file handle. The file is opened in the constructor
   // based on creation information passed to it, and automatically closed in
@@ skipping 13 matching lines @@
   int render_view_id_;
 
   // Handle for informing the ResourceDispatcherHost of a UI based cancel.
   int request_id_;
 
   // Amount of data received up to this point. We may not know in advance how
   // much data to expect since some servers don't provide that information.
   int64 bytes_so_far_;
 
   // Full path to the downloaded file.
-  FilePath full_path_;
+  std::wstring full_path_;
 
   // Whether the download is still using its initial temporary path.
   bool path_renamed_;
 
   // Whether the download is still receiving data.
   bool in_progress_;
 
   DISALLOW_EVIL_CONSTRUCTORS(DownloadFile);
 };
 
@@ skipping 39 matching lines @@
                      const GURL& referrer,
                      int render_process_host_id,
                      int render_view_id,
                      URLRequestContext* request_context);
 
   // Called on the UI thread to remove a download item or manager.
   void RemoveDownloadManager(DownloadManager* manager);
   void RemoveDownload(int id, DownloadManager* manager);
 
   // Handler for shell operations sent from the UI to the download thread.
-  void OnShowDownloadInShell(const FilePath& full_path);
+  void OnShowDownloadInShell(const std::wstring full_path);
   // Handler to open or execute a downloaded file.
-  void OnOpenDownloadInShell(const FilePath& full_path,
+  void OnOpenDownloadInShell(const std::wstring full_path,
                              const std::wstring& url, HWND parent_window);
 
   // The download manager has provided a final name for a download. Sent from
   // the UI thread and run on the download thread.
-  void OnFinalDownloadName(int id, const FilePath& full_path);
+  void OnFinalDownloadName(int id, const std::wstring& full_path);
 
   // Timer notifications.
   void UpdateInProgressDownloads();
 
   MessageLoop* file_loop() const { return file_loop_; }
 
-  // Called by the download manager to delete non validated dangerous downloads.
-  static void DeleteFile(const FilePath& path);
+  // Called by the download manager at initialization to ensure the default
+  // download directory exists.
+  void CreateDirectory(const std::wstring& directory);
+
+  // Called by the donwload manager to delete non validated dangerous downloads.
+  void DeleteFile(const std::wstring& path);
 
  private:
   // Timer helpers for updating the UI about the current progress of a download.
   void StartUpdateTimer();
   void StopUpdateTimer();
 
   // Clean up helper that runs on the download thread.
   void OnShutdown();
 
   // Called only on UI thread to get the DownloadManager for a tab's profile.
@@ skipping 42 matching lines @@
   // Used for progress updates on the UI thread, mapping download->id() to bytes
   // received so far. Written to by the file thread and read by the UI thread.
   typedef base::hash_map<int, int64> ProgressMap;
   ProgressMap ui_progress_;
   Lock progress_lock_;
 
   DISALLOW_EVIL_CONSTRUCTORS(DownloadFileManager);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_FILE_H__