Directory upload: remember the last directory chosen, not its parent

chrome/browser/file_select_helper_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 <stddef.h>
 
+#include <vector>
+
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "build/build_config.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/test/base/testing_profile.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using content::FileChooserParams;
+
 class FileSelectHelperTest : public testing::Test {
  public:
   FileSelectHelperTest() {}
 
  protected:
   void SetUp() override {
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_dir_));
     data_dir_ = data_dir_.AppendASCII("file_select_helper");
     ASSERT_TRUE(base::PathExists(data_dir_));
   }
@@ skipping 77 matching lines @@
   base::FilePath::CharType kBadName[] = {0xe3, 0x81, 0x81, 0x81, 0x82, 0};
 #endif
   base::FilePath bad_filename(kBadName);
   ASSERT_FALSE(bad_filename.empty());
   // The only thing we are testing is that if the source filename was non-empty,
   // the resulting filename is also not empty. Invalid encoded filenames can
   // cause conversions to fail. Such failures shouldn't cause the resulting
   // filename to disappear.
   EXPECT_FALSE(FileSelectHelper::GetSanitizedFileName(bad_filename).empty());
 }
+
+TEST_F(FileSelectHelperTest, LastSelectedDirectory) {
+  content::TestBrowserThreadBundle browser_thread_bundle;
+  TestingProfile profile;
+  scoped_refptr<FileSelectHelper> file_select_helper =
+      new FileSelectHelper(&profile);
+
+  const int index = 0;
+  void* params = nullptr;
+
+  const base::FilePath dir_path_1 = data_dir_.AppendASCII("dir1");
+  const base::FilePath dir_path_2 = data_dir_.AppendASCII("dir2");
+  const base::FilePath file_path_1 = dir_path_1.AppendASCII("file1.txt");
+  const base::FilePath file_path_2 = dir_path_2.AppendASCII("file2.txt");

[nasko, 2016/10/27 22:58:24]

Shouldn't the two files be in the same directory? Can you select multiple files
from separate directories?

[jsbell, 2016/10/28 00:21:03]

Hrm, good point. Doesn't really matter for the test but matching reality is
probably smart.

(I also don't think we allow selection of multiple folders so the
MultiFilesSelected() would never be called if the mode is UploadFolder, but this
class itself doesn't enforce that.)

+  std::vector<base::FilePath> files;
+  files.push_back(file_path_1);
+  files.push_back(file_path_2);
+  std::vector<base::FilePath> dirs;
+  dirs.push_back(dir_path_1);
+  dirs.push_back(dir_path_2);
+
+  // Modes where the parent of the selection is remembered.
+  const std::vector<FileChooserParams::Mode> modes = {
+    FileChooserParams::Open,
+    FileChooserParams::OpenMultiple,
+    FileChooserParams::Save,
+  };
+
+  for (const auto& mode : modes) {
+    file_select_helper->dialog_mode_ = mode;
+
+    file_select_helper->AddRef();  // Normally called by RunFileChooser().
+    file_select_helper->FileSelected(file_path_1, index, params);
+    EXPECT_EQ(dir_path_1, profile.last_selected_directory());
+
+    file_select_helper->AddRef();  // Normally called by RunFileChooser().
+    file_select_helper->FileSelected(file_path_2, index, params);
+    EXPECT_EQ(dir_path_2, profile.last_selected_directory());
+
+    file_select_helper->AddRef();  // Normally called by RunFileChooser().
+    file_select_helper->MultiFilesSelected(files, params);
+    EXPECT_EQ(dir_path_1, profile.last_selected_directory());
+  }
+
+  // Type where the selected folder itself is remembered.
+  file_select_helper->dialog_mode_ = FileChooserParams::UploadFolder;
+
+  file_select_helper->AddRef();  // Normally called by RunFileChooser().
+  file_select_helper->FileSelected(dir_path_1, index, params);
+  EXPECT_EQ(dir_path_1, profile.last_selected_directory());
+
+  file_select_helper->AddRef();  // Normally called by RunFileChooser().
+  file_select_helper->FileSelected(dir_path_2, index, params);
+  EXPECT_EQ(dir_path_2, profile.last_selected_directory());
+
+  file_select_helper->AddRef();  // Normally called by RunFileChooser().
+  file_select_helper->MultiFilesSelected(dirs, params);
+  EXPECT_EQ(dir_path_1, profile.last_selected_directory());
+}