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/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/download/chrome_download_manager_delegate.h"
@@ skipping 233 matching lines @@
 base::FilePath ChromeDownloadManagerDelegateTest::GetPathInDownloadDir(
     const char* relative_path) {
   base::FilePath full_path =
       test_download_dir_.path().AppendASCII(relative_path);
   return full_path.NormalizePathSeparators();
 }
 
 void ChromeDownloadManagerDelegateTest::SetDefaultDownloadPath(
     const base::FilePath& path) {
   pref_service_->SetFilePath(prefs::kDownloadDefaultDirectory, path);
+  pref_service_->SetFilePath(prefs::kSaveFileDefaultDirectory, path);
 }
 
 void ChromeDownloadManagerDelegateTest::DetermineDownloadTarget(
     DownloadItem* download_item,
     DownloadTarget* result) {
   base::WeakPtrFactory<ChromeDownloadManagerDelegateTest> factory(this);
   delegate()->DetermineDownloadTarget(
       download_item,
       base::Bind(&ChromeDownloadManagerDelegateTest::OnDownloadTargetDone,
                  factory.GetWeakPtr(), base::Unretained(result)));
@@ skipping 29 matching lines @@
 }
 
 DownloadPrefs* ChromeDownloadManagerDelegateTest::download_prefs() {
   return delegate_->download_prefs();
 }
 
 }  // namespace
 
 TEST_F(ChromeDownloadManagerDelegateTest, StartDownload_LastSavePath) {
   GURL download_url("http://example.com/foo.txt");
-  delegate()->ClearLastDownloadPath();
 
   scoped_ptr<content::MockDownloadItem> save_as_download(
       CreateActiveDownloadItem(0));
   EXPECT_CALL(*save_as_download, GetURL())
       .Times(::testing::AnyNumber())
       .WillRepeatedly(ReturnRef(download_url));
   EXPECT_CALL(*save_as_download, GetTargetDisposition())
       .Times(::testing::AnyNumber())
       .WillRepeatedly(Return(DownloadItem::TARGET_DISPOSITION_PROMPT));
 
@@ skipping 37 matching lines @@
   {
     // Start an automatic download. This one should get the default download
     // path since the last download path only affects Save As downloads.
     DownloadTarget result;
     base::FilePath expected_path(GetPathInDownloadDir("foo.txt"));
     DetermineDownloadTarget(automatic_download.get(), &result);
     EXPECT_EQ(expected_path, result.target_path);
     VerifyAndClearExpectations();
   }
 
-  // Clear the last download path.
-  delegate()->ClearLastDownloadPath();
-
   {
     // The prompt path for the next download should be the default.
+    download_prefs()->SetSaveFilePath(download_prefs()->DownloadPath());
     DownloadTarget result;
     base::FilePath expected_prompt_path(GetPathInDownloadDir("foo.txt"));
     EXPECT_CALL(*delegate(),
                 MockPromptUserForDownloadPath(save_as_download.get(),
                                               expected_prompt_path, _))
         .WillOnce(Return(base::FilePath()));
     DetermineDownloadTarget(save_as_download.get(), &result);
     VerifyAndClearExpectations();
   }
 }
+
+// TODO(benjhayden): DownloadPrefs::[Set]SaveFilePath() on-the-record vs. off