[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/registry_unittest.cc

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);