Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index b26b5a24ffbb3f153044f7a188c1ff0ec3da4dd4..d0c9220d1e94835ba1f484dd59a728eeae83fe8b 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -479,6 +479,9 @@ class DownloadTest : public InProcessBrowserTest {
     browser->profile()->GetPrefs()->SetFilePath(
         prefs::kDownloadDefaultDirectory,
         downloads_directory_.path());
+    browser->profile()->GetPrefs()->SetFilePath(
+        prefs::kSaveFileDefaultDirectory,
+        downloads_directory_.path());
 
     return true;
   }
@@ -1395,6 +1398,9 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_IncognitoRegular) {
   incognito->profile()->GetPrefs()->SetFilePath(
       prefs::kDownloadDefaultDirectory,
       GetDownloadsDirectory());
+  incognito->profile()->GetPrefs()->SetFilePath(
+      prefs::kSaveFileDefaultDirectory,
+      GetDownloadsDirectory());
 
   download_items.clear();
   GetDownloads(incognito, &download_items);