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 f74c304afc062feee8816db49f6c570e4f1bf048..a2030e719823fd0ac2d086a16647a2cf02a5d3d2 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);
@@ -2942,3 +2948,29 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_DenyDanger) {
   EXPECT_EQ(1u, observer->NumDangerousDownloadsSeen());
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }
+
+IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadPrefs_SaveFilePath) {
+  DownloadPrefs* on_prefs = DownloadServiceFactory::GetForProfile(
+      browser()->profile())->GetDownloadManagerDelegate()->download_prefs();
+  DownloadPrefs* off_prefs = DownloadServiceFactory::GetForProfile(
+      browser()->profile()->GetOffTheRecordProfile())
+    ->GetDownloadManagerDelegate()->download_prefs();
+  base::FilePath dir(on_prefs->SaveFilePath());
+  EXPECT_EQ(dir.value(), off_prefs->SaveFilePath().value());
+
+  on_prefs->SetSaveFilePath(dir.AppendASCII("on"));
+  EXPECT_EQ(dir.AppendASCII("on").value(), on_prefs->SaveFilePath().value());
+  EXPECT_EQ(dir.AppendASCII("on").value(), off_prefs->SaveFilePath().value());
+
+  on_prefs->SetSaveFilePath(dir);
+  EXPECT_EQ(dir.value(), on_prefs->SaveFilePath().value());
+  EXPECT_EQ(dir.value(), off_prefs->SaveFilePath().value());
+
+  off_prefs->SetSaveFilePath(dir.AppendASCII("off"));
+  EXPECT_EQ(dir.value(), on_prefs->SaveFilePath().value());
+  EXPECT_EQ(dir.AppendASCII("off").value(), off_prefs->SaveFilePath().value());
+
+  on_prefs->SetSaveFilePath(dir.AppendASCII("on"));
+  EXPECT_EQ(dir.AppendASCII("on").value(), on_prefs->SaveFilePath().value());
+  EXPECT_EQ(dir.AppendASCII("off").value(), off_prefs->SaveFilePath().value());
+}