Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/chrome_download_manager_delegate_unittest.cc

Index: chrome/browser/download/chrome_download_manager_delegate_unittest.cc
diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
index 700362ae31347b93a135886b9245372210081fe3..dad5fc533c629cb23d25398989188cb814a7a3c5 100644
--- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc
@@ -464,6 +464,7 @@ void ChromeDownloadManagerDelegateTest::RunTestCases(
 void ChromeDownloadManagerDelegateTest::SetDefaultDownloadPath(
     const base::FilePath& path) {
   pref_service_->SetFilePath(prefs::kDownloadDefaultDirectory, path);
+  pref_service_->SetFilePath(prefs::kSaveFileDefaultDirectory, path);
 }
 
 void ChromeDownloadManagerDelegateTest::SetManagedDownloadPath(
@@ -595,7 +596,7 @@ TEST_F(ChromeDownloadManagerDelegateTest, StartDownload_Basic) {
 
 #if defined(FULL_SAFE_BROWSING)
     // These test cases are only applicable if safe browsing is enabled. Without
-    // it, these are equivalent to FORCED/SAFE and SAFE_AS/SAFE respectively.
+    // it, these are equivalent to FORCED/SAFE and SAVE_AS/SAFE respectively.
     {
       // 4: Forced Dangerous. As above. .jar is considered to be one of the file
       // types supportred by safe browsing.
@@ -911,9 +912,6 @@ TEST_F(ChromeDownloadManagerDelegateTest, StartDownload_LastSavePath) {
 
   RunTestCases(kLastSavePathTestCases, arraysize(kLastSavePathTestCases));
 
-  // Now clear the last download path.
-  delegate()->ClearLastDownloadPath();
-
   // Run the first test case again. Since the last download path was cleared,
   // this test case should behave identically to the first time it was run.
   RunTestCases(kLastSavePathTestCases, 1);