Commit b4ba481b authored by Charles Zhao's avatar Charles Zhao Committed by Commit Bot

Removing profile_->GetPath().IsParent(path) check for

FileTasksNotifier::NotifyObservers.

It's there only because the util::GetMyFilesFolderForProfile(profile)
returns a different result than
profile.GetPath().Append("MyFiles") for TestingProfile in unit tests.

This fix basically using util::GetMyFilesFolderForProfile(profile) in
both the lib and unit tests.

util::GetMyFilesFolderForProfile(profile_).DirName() is used to make it also compatible with drive path in browser_tests, like /b/s/w/itMnZ3yB/.org.chromium.Chromium.skZUsj/user_data/user/drive/v2/root/Beautiful


Bug: 1077163

Change-Id: I0a2cc3531929b29c0a4ef254d9db02dd4b789bc4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2211583Reviewed-by: default avatarSam McNally <sammc@chromium.org>
Reviewed-by: default avatarCharles . <charleszhao@chromium.org>
Commit-Queue: Charles . <charleszhao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816047}
parent 80bc6087
...@@ -156,8 +156,7 @@ void FileTasksNotifier::NotifyObservers( ...@@ -156,8 +156,7 @@ void FileTasksNotifier::NotifyObservers(
FileTasksObserver::OpenType open_type) { FileTasksObserver::OpenType open_type) {
std::vector<FileTasksObserver::FileOpenEvent> opens; std::vector<FileTasksObserver::FileOpenEvent> opens;
for (const auto& path : paths) { for (const auto& path : paths) {
if (profile_->GetPath().IsParent(path) || if (util::GetMyFilesFolderForProfile(profile_).DirName().IsParent(path) ||
util::GetMyFilesFolderForProfile(profile_).IsParent(path) ||
base::FilePath("/run/arc/sdcard/write/emulated/0").IsParent(path) || base::FilePath("/run/arc/sdcard/write/emulated/0").IsParent(path) ||
base::FilePath("/media/fuse").IsParent(path)) { base::FilePath("/media/fuse").IsParent(path)) {
opens.push_back({path, open_type}); opens.push_back({path, open_type});
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "base/scoped_observer.h" #include "base/scoped_observer.h"
#include "base/test/bind_test_util.h" #include "base/test/bind_test_util.h"
#include "chrome/browser/chromeos/file_manager/file_tasks_observer.h" #include "chrome/browser/chromeos/file_manager/file_tasks_observer.h"
#include "chrome/browser/chromeos/file_manager/path_util.h"
#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile.h"
#include "chromeos/components/drivefs/mojom/drivefs.mojom-test-utils.h" #include "chromeos/components/drivefs/mojom/drivefs.mojom-test-utils.h"
#include "chromeos/components/drivefs/mojom/drivefs.mojom.h" #include "chromeos/components/drivefs/mojom/drivefs.mojom.h"
...@@ -135,12 +136,11 @@ class FileTasksNotifierTest : public testing::Test { ...@@ -135,12 +136,11 @@ class FileTasksNotifierTest : public testing::Test {
observer_ = std::make_unique<MockFileTasksObserver>(notifier_.get()); observer_ = std::make_unique<MockFileTasksObserver>(notifier_.get());
auto* mount_points = storage::ExternalMountPoints::GetSystemInstance(); auto* mount_points = storage::ExternalMountPoints::GetSystemInstance();
my_files_ = profile().GetPath().Append("MyFiles"); my_files_ = util::GetMyFilesFolderForProfile(profile_.get());
ASSERT_TRUE(base::CreateDirectory(my_files_)); ASSERT_TRUE(base::CreateDirectory(my_files_));
base::WriteFile(my_files_.Append("file"), "data", 4); base::WriteFile(my_files_.Append("file"), "data", 4);
ASSERT_TRUE(mount_points->RegisterFileSystem( ASSERT_TRUE(mount_points->RegisterFileSystem(
"downloads", storage::kFileSystemTypeNativeLocal, {}, "downloads", storage::kFileSystemTypeNativeLocal, {}, my_files_));
profile().GetPath().Append("MyFiles")));
ASSERT_TRUE(mount_points->RegisterFileSystem( ASSERT_TRUE(mount_points->RegisterFileSystem(
"drivefs", storage::kFileSystemTypeDriveFs, {}, "drivefs", storage::kFileSystemTypeDriveFs, {},
base::FilePath("/media/fuse/drivefs"))); base::FilePath("/media/fuse/drivefs")));
...@@ -186,7 +186,7 @@ class FileTasksNotifierTest : public testing::Test { ...@@ -186,7 +186,7 @@ class FileTasksNotifierTest : public testing::Test {
}; };
TEST_F(FileTasksNotifierTest, FileTask_Local) { TEST_F(FileTasksNotifierTest, FileTask_Local) {
base::FilePath path = profile().GetPath().Append("file"); base::FilePath path = my_files().Append("file");
EXPECT_CALL(observer(), EXPECT_CALL(observer(),
OnFilesOpenedImpl(path, FileTasksObserver::OpenType::kLaunch)); OnFilesOpenedImpl(path, FileTasksObserver::OpenType::kLaunch));
notifier().NotifyFileTasks({CreateFileSystemUrl(path)}); notifier().NotifyFileTasks({CreateFileSystemUrl(path)});
...@@ -234,7 +234,7 @@ TEST_F(FileTasksNotifierTest, FileTask_ArcDocumentsProvider) { ...@@ -234,7 +234,7 @@ TEST_F(FileTasksNotifierTest, FileTask_ArcDocumentsProvider) {
} }
TEST_F(FileTasksNotifierTest, FileTask_Multiple) { TEST_F(FileTasksNotifierTest, FileTask_Multiple) {
base::FilePath local_path = profile().GetPath().Append("file"); base::FilePath local_path = my_files().Append("file");
base::FilePath drivefs_path("/media/fuse/drivefs-abcedf/root/file"); base::FilePath drivefs_path("/media/fuse/drivefs-abcedf/root/file");
base::FilePath arc_path("/run/arc/sdcard/write/emulated/0/file"); base::FilePath arc_path("/run/arc/sdcard/write/emulated/0/file");
base::FilePath crostini_path("/media/fuse/crostini-abcdef/file"); base::FilePath crostini_path("/media/fuse/crostini-abcdef/file");
...@@ -265,7 +265,7 @@ TEST_F(FileTasksNotifierTest, FileTask_Multiple) { ...@@ -265,7 +265,7 @@ TEST_F(FileTasksNotifierTest, FileTask_Multiple) {
} }
TEST_F(FileTasksNotifierTest, DialogSelection_Local) { TEST_F(FileTasksNotifierTest, DialogSelection_Local) {
base::FilePath path = profile().GetPath().Append("file"); base::FilePath path = my_files().Append("file");
EXPECT_CALL(observer(), EXPECT_CALL(observer(),
OnFilesOpenedImpl(path, FileTasksObserver::OpenType::kOpen)); OnFilesOpenedImpl(path, FileTasksObserver::OpenType::kOpen));
notifier().NotifyFileDialogSelection({CreateSelectedFileInfo(path)}, true); notifier().NotifyFileDialogSelection({CreateSelectedFileInfo(path)}, true);
...@@ -336,7 +336,7 @@ TEST_F(FileTasksNotifierTest, DialogSelection_ArcDocumentsProvider) { ...@@ -336,7 +336,7 @@ TEST_F(FileTasksNotifierTest, DialogSelection_ArcDocumentsProvider) {
} }
TEST_F(FileTasksNotifierTest, DialogSelection_Multiple) { TEST_F(FileTasksNotifierTest, DialogSelection_Multiple) {
base::FilePath local_path = profile().GetPath().Append("file"); base::FilePath local_path = my_files().Append("file");
base::FilePath drivefs_path("/media/fuse/drivefs-abcdef/root/file"); base::FilePath drivefs_path("/media/fuse/drivefs-abcdef/root/file");
base::FilePath arc_path("/run/arc/sdcard/write/emulated/0/file"); base::FilePath arc_path("/run/arc/sdcard/write/emulated/0/file");
base::FilePath crostini_path("/media/fuse/crostini-abcdef/file"); base::FilePath crostini_path("/media/fuse/crostini-abcdef/file");
...@@ -385,7 +385,7 @@ TEST_F(FileTasksNotifierTest, DialogSelection_Multiple) { ...@@ -385,7 +385,7 @@ TEST_F(FileTasksNotifierTest, DialogSelection_Multiple) {
} }
TEST_F(FileTasksNotifierTest, Download_Local) { TEST_F(FileTasksNotifierTest, Download_Local) {
base::FilePath path = profile().GetPath().Append("file"); base::FilePath path = my_files().Append("file");
EXPECT_CALL(observer(), EXPECT_CALL(observer(),
OnFilesOpenedImpl(path, FileTasksObserver::OpenType::kDownload)); OnFilesOpenedImpl(path, FileTasksObserver::OpenType::kDownload));
notifier().OnDownloadUpdated(nullptr, CreateCompletedDownloadItem(path)); notifier().OnDownloadUpdated(nullptr, CreateCompletedDownloadItem(path));
...@@ -427,7 +427,7 @@ TEST_F(FileTasksNotifierTest, Download_RemovableMedia) { ...@@ -427,7 +427,7 @@ TEST_F(FileTasksNotifierTest, Download_RemovableMedia) {
TEST_F(FileTasksNotifierTest, Download_Incomplete) { TEST_F(FileTasksNotifierTest, Download_Incomplete) {
EXPECT_CALL(observer(), OnFilesOpenedImpl(_, _)).Times(0); EXPECT_CALL(observer(), OnFilesOpenedImpl(_, _)).Times(0);
content::FakeDownloadItem download_item; content::FakeDownloadItem download_item;
download_item.SetTargetFilePath(profile().GetPath().Append("file")); download_item.SetTargetFilePath(my_files().Append("file"));
for (auto state : {download::DownloadItem::DownloadState::IN_PROGRESS, for (auto state : {download::DownloadItem::DownloadState::IN_PROGRESS,
download::DownloadItem::DownloadState::CANCELLED, download::DownloadItem::DownloadState::CANCELLED,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment