Move download filename determintion into a separate class.

chrome/browser/download/download_file_picker.cc

Index: chrome/browser/download/download_file_picker.cc
diff --git a/chrome/browser/download/download_file_picker.cc b/chrome/browser/download/download_file_picker.cc
index a968b06122193321e4f6c0133248610cc52561ce..2d49b352ae02edec1ee137b5300c196514bcd884 100644
--- a/chrome/browser/download/download_file_picker.cc
+++ b/chrome/browser/download/download_file_picker.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/web_contents.h"
@@ -47,6 +48,8 @@ void RecordFilePickerResult(DownloadManager* manager,
 
 FilePickerResult ComparePaths(const base::FilePath& suggested_path,
                               const base::FilePath& actual_path) {
+  if (actual_path.empty())
+    return FILE_PICKER_CANCEL;
   if (suggested_path == actual_path)
     return FILE_PICKER_SAME;
   if (suggested_path.DirName() != actual_path.DirName())
@@ -56,19 +59,15 @@ FilePickerResult ComparePaths(const base::FilePath& suggested_path,
 
 }  // namespace
 
-DownloadFilePicker::DownloadFilePicker() : download_id_(0) {
-}
-
-void DownloadFilePicker::Init(
-    DownloadManager* download_manager,
+DownloadFilePicker::DownloadFilePicker(
     DownloadItem* item,
     const base::FilePath& suggested_path,
-    const ChromeDownloadManagerDelegate::FileSelectedCallback& callback) {
-  download_manager_ = download_manager;
-  download_id_ = item->GetId();
-  file_selected_callback_ = callback;
-  InitSuggestedPath(item, suggested_path);
-
+    const FileSelectedCallback& callback)
+    : suggested_path_(suggested_path),
+      file_selected_callback_(callback),
+      download_id_(item->GetId()) {

[benjhayden, 2013/04/26 15:07:37]

Is this used anywhere?

[asanka, 2013/04/26 17:02:21]

Apparently not. Removed.

+  download_manager_ =
+      content::BrowserContext::GetDownloadManager(item->GetBrowserContext());
   DCHECK(download_manager_);
   WebContents* web_contents = item->GetWebContents();
   select_file_dialog_ = ui::SelectFileDialog::Create(
@@ -99,32 +98,29 @@ void DownloadFilePicker::Init(
 DownloadFilePicker::~DownloadFilePicker() {
 }
 
-void DownloadFilePicker::InitSuggestedPath(
-    DownloadItem* item,
-    const base::FilePath& suggested_path) {
-  set_suggested_path(suggested_path);
-}
-
 void DownloadFilePicker::OnFileSelected(const base::FilePath& path) {
-  file_selected_callback_.Run(path);
-  delete this;
-}
-
-void DownloadFilePicker::RecordFileSelected(const base::FilePath& path) {
   FilePickerResult result = ComparePaths(suggested_path_, path);
   RecordFilePickerResult(download_manager_, result);
+  file_selected_callback_.Run(path);
+  delete this;
 }
 
 void DownloadFilePicker::FileSelected(const base::FilePath& path,
                                       int index,
                                       void* params) {
-  RecordFileSelected(path);
   OnFileSelected(path);
   // Deletes |this|
 }
 
 void DownloadFilePicker::FileSelectionCanceled(void* params) {
-  RecordFilePickerResult(download_manager_, FILE_PICKER_CANCEL);
   OnFileSelected(base::FilePath());
   // Deletes |this|
 }
+
+// static
+void DownloadFilePicker::ShowFilePicker(DownloadItem* item,
+                                        const base::FilePath& suggested_path,
+                                        const FileSelectedCallback& callback) {
+  new DownloadFilePicker(item, suggested_path, callback);
+  // DownloadFilePicker deletes itself.
+}