[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/registry_unittest.cc

 // Copyright 2014 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 "chrome/browser/chromeos/file_system_provider/registry.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
@@ skipping 108 matching lines @@
   const RegistryInterface::RestoredFileSystem& restored_file_system =
       restored_file_systems->at(0);
   EXPECT_EQ(kExtensionId, restored_file_system.extension_id);
   EXPECT_EQ(kFileSystemId, restored_file_system.options.file_system_id);
   EXPECT_EQ(kDisplayName, restored_file_system.options.display_name);
   EXPECT_TRUE(restored_file_system.options.writable);
   EXPECT_TRUE(restored_file_system.options.supports_notify_tag);
 
   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);
 
   EXPECT_EQ(fake_observed_entry_.entry_path,
             restored_observed_entry_it->second.entry_path);
   EXPECT_EQ(fake_observed_entry_.recursive,
             restored_observed_entry_it->second.recursive);
   EXPECT_EQ(fake_observed_entry_.last_tag,
             restored_observed_entry_it->second.last_tag);
 }
 
 TEST_F(FileSystemProviderRegistryTest, RememberFileSystem) {
   MountOptions options(kFileSystemId, kDisplayName);
   options.writable = true;
   options.supports_notify_tag = true;
 
   ProvidedFileSystemInfo file_system_info(
       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);
 
   TestingPrefServiceSyncable* const pref_service =
       profile_->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
 
   const base::DictionaryValue* const extensions =
       pref_service->GetDictionary(prefs::kFileSystemProviderMounted);
   ASSERT_TRUE(extensions);
@@ skipping 80 matching lines @@
 
 TEST_F(FileSystemProviderRegistryTest, UpdateObservedEntryTag) {
   MountOptions options(kFileSystemId, kDisplayName);
   options.writable = true;
   options.supports_notify_tag = true;
 
   ProvidedFileSystemInfo file_system_info(
       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);
 
   fake_observed_entry_.last_tag = "updated-tag";
   registry_->UpdateObservedEntryTag(file_system_info, fake_observed_entry_);
 
   TestingPrefServiceSyncable* const pref_service =
       profile_->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
 
@@ skipping 51 matching lines @@
   EXPECT_EQ(fake_observed_entry_.recursive, recursive);
 
   std::string last_tag;
   EXPECT_TRUE(observed_entry->GetStringWithoutPathExpansion(
       kPrefKeyObservedEntryLastTag, &last_tag));
   EXPECT_EQ(fake_observed_entry_.last_tag, last_tag);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos