Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/chrome_download_manager_delegate_unittest.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 "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
 #include "base/prefs/pref_service.h"
@@ skipping 446 matching lines @@
   for (size_t i = 0; i < test_case_count; ++i) {
     scoped_ptr<content::MockDownloadItem> item(CreateActiveDownloadItem(i));
     SCOPED_TRACE(testing::Message() << "Running test case " << i);
     RunTestCaseWithDownloadItem(test_cases[i], item.get());
   }
 }
 
 void ChromeDownloadManagerDelegateTest::SetDefaultDownloadPath(
     const base::FilePath& path) {
   pref_service_->SetFilePath(prefs::kDownloadDefaultDirectory, path);
+  pref_service_->SetFilePath(prefs::kSaveFileDefaultDirectory, path);
 }
 
 void ChromeDownloadManagerDelegateTest::SetManagedDownloadPath(
     const base::FilePath& path) {
   pref_service_->SetManagedPref(prefs::kDownloadDefaultDirectory,
                                 base::CreateFilePathValue(path));
 }
 
 void ChromeDownloadManagerDelegateTest::SetPromptForDownload(bool prompt) {
   pref_service_->SetBoolean(prefs::kPromptForDownload, prompt);
@@ skipping 111 matching lines @@
 
       FILE_PATH_LITERAL("forced-foo.txt"),
       FILE_PATH_LITERAL(""),
       DownloadItem::TARGET_DISPOSITION_OVERWRITE,
 
       EXPECT_TARGET_PATH
     },
 
 #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.
       FORCED,
       content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT,
       "http://example.com/foo.exe", "",
       FILE_PATH_LITERAL("forced-foo.exe"),
 
       FILE_PATH_LITERAL("forced-foo.exe"),
       FILE_PATH_LITERAL(""),
@@ skipping 295 matching lines @@
       FILE_PATH_LITERAL("foo.txt"),
       FILE_PATH_LITERAL(""),
       DownloadItem::TARGET_DISPOSITION_OVERWRITE,
 
       EXPECT_CRDOWNLOAD
     },
   };
 
   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);
 }
 
 // TODO(asanka): Add more tests.
 // * Default download path is not writable.
 // * Download path doesn't exist.
 // * IsDangerousFile().
 // * Filename generation.