Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3789)

Unified Diff: chrome/browser/chromeos/file_system_provider/registry_unittest.cc

Issue 679573002: [fsp] Separate recursive and non-recursive watchers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/file_system_provider/registry_unittest.cc
diff --git a/chrome/browser/chromeos/file_system_provider/registry_unittest.cc b/chrome/browser/chromeos/file_system_provider/registry_unittest.cc
index 45b9c688ea0c1f3a45fdf7d844236ad1a5ada96d..e4a66ea9c2c4734c0401a65b22673bafbc293826 100644
--- a/chrome/browser/chromeos/file_system_provider/registry_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/registry_unittest.cc
@@ -126,8 +126,8 @@ TEST_F(FileSystemProviderRegistryTest, RestoreFileSystems) {
ASSERT_EQ(1u, restored_file_system.observed_entries.size());
const auto& restored_observed_entry_it =
- restored_file_system.observed_entries.find(
- fake_observed_entry_.entry_path);
+ restored_file_system.observed_entries.find(ObservedEntryKey(
+ fake_observed_entry_.entry_path, fake_observed_entry_.recursive));
ASSERT_NE(restored_file_system.observed_entries.end(),
restored_observed_entry_it);
@@ -148,7 +148,9 @@ TEST_F(FileSystemProviderRegistryTest, RememberFileSystem) {
kExtensionId, options, base::FilePath(FILE_PATH_LITERAL("/a/b/c")));
ObservedEntries observed_entries;
- observed_entries[fake_observed_entry_.entry_path] = fake_observed_entry_;
+ observed_entries[ObservedEntryKey(fake_observed_entry_.entry_path,
+ fake_observed_entry_.recursive)] =
+ fake_observed_entry_;
registry_->RememberFileSystem(file_system_info, observed_entries);
@@ -249,7 +251,9 @@ TEST_F(FileSystemProviderRegistryTest, UpdateObservedEntryTag) {
kExtensionId, options, base::FilePath(FILE_PATH_LITERAL("/a/b/c")));
ObservedEntries observed_entries;
- observed_entries[fake_observed_entry_.entry_path] = fake_observed_entry_;
+ observed_entries[ObservedEntryKey(fake_observed_entry_.entry_path,
+ fake_observed_entry_.recursive)] =
+ fake_observed_entry_;
registry_->RememberFileSystem(file_system_info, observed_entries);
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/registry.cc ('k') | chrome/browser/chromeos/file_system_provider/service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698