Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/save_package_file_picker.cc

 // Copyright (c) 2012 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_file_picker.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
@@ skipping 61 matching lines @@
          CommandLine::ForCurrentProcess()->HasSwitch(
              switches::kSavePageAsMHTML);
 }
 
 SavePackageFilePicker::SavePackageFilePicker(
     content::WebContents* web_contents,
     const base::FilePath& suggested_path_const,
     const base::FilePath::StringType& default_extension_const,
     bool can_save_as_complete,
     DownloadPrefs* download_prefs,
+    const base::Callback<void(const base::FilePath&)>& on_chosen,
     const content::SavePackagePathPickedCallback& callback)
     : render_process_id_(web_contents->GetRenderProcessHost()->GetID()),
       can_save_as_complete_(can_save_as_complete),
+      on_chosen_(on_chosen),
       callback_(callback) {
   base::FilePath suggested_path = suggested_path_const;
   base::FilePath::StringType default_extension = default_extension_const;
   int file_type_index = SavePackageTypeToIndex(
       static_cast<SavePageType>(download_prefs->save_file_type()));
   DCHECK_NE(-1, file_type_index);
 
   ui::SelectFileDialog::FileTypeInfo file_type_info;
 
   // TODO(benjhayden): Merge the first branch with the second when all of the
@@ skipping 105 matching lines @@
       save_type = kIndexToSaveType[index];
       if (select_file_dialog_ &&
           select_file_dialog_->HasMultipleFileTypeChoices())
         prefs->SetInteger(prefs::kSaveFileType, save_type);
     }
 
     UMA_HISTOGRAM_ENUMERATION("Download.SavePageType",
                               save_type,
                               content::SAVE_PAGE_TYPE_MAX);
 
-    StringPrefMember save_file_path;
-    save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs);
-#if defined(OS_POSIX)
-    std::string path_string = path.DirName().value();
-#elif defined(OS_WIN)
-    std::string path_string = WideToUTF8(path.DirName().value());
-#endif
-    // If user change the default saving directory, we will remember it just
-    // like IE and FireFox.
-    if (!process->GetBrowserContext()->IsOffTheRecord() &&
-        save_file_path.GetValue() != path_string)
-      save_file_path.SetValue(path_string);
-
+    on_chosen_.Run(path);
     callback_.Run(path, save_type, base::Bind(&OnSavePackageDownloadCreated));
   }
 
   delete this;
 }
 
 void SavePackageFilePicker::FileSelectionCanceled(void* unused_params) {
   delete this;
 }