[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/service_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/service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
@@ skipping 117 matching lines @@
       result->push_back(restored_file_system);
     }
 
     return result;
   }
 
   virtual void UpdateObservedEntryTag(
       const ProvidedFileSystemInfo& file_system_info,
       const ObservedEntry& observed_entry) override {
     ASSERT_TRUE(observed_entries_.get());
-    const ObservedEntries::iterator it =
-        observed_entries_->find(observed_entry.entry_path);
+    const ObservedEntries::iterator it = observed_entries_->find(
+        ObservedEntryKey(observed_entry.entry_path, observed_entry.recursive));
     ASSERT_NE(observed_entries_->end(), it);
     it->second.last_tag = observed_entry.last_tag;
   }
 
   ProvidedFileSystemInfo* const file_system_info() const {
     return file_system_info_.get();
   }
   ObservedEntries* const observed_entries() const {
     return observed_entries_.get();
   }
@@ skipping 245 matching lines @@
 TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) {
   LoggingObserver observer;
   service_->AddObserver(&observer);
 
   // Remember a fake file system first in order to be able to restore it.
   MountOptions options(kFileSystemId, kDisplayName);
   options.supports_notify_tag = true;
   ProvidedFileSystemInfo file_system_info(
       kExtensionId, options, base::FilePath(FILE_PATH_LITERAL("/a/b/c")));
   ObservedEntries fake_observed_entries;
-  fake_observed_entries[fake_observed_entry_.entry_path] = fake_observed_entry_;
+  fake_observed_entries[ObservedEntryKey(fake_observed_entry_.entry_path,
+                                         fake_observed_entry_.recursive)] =
+      fake_observed_entry_;
   registry_->RememberFileSystem(file_system_info, fake_observed_entries);
 
   EXPECT_EQ(0u, observer.mounts.size());
 
   // Directly call the observer's method.
   service_->OnExtensionLoaded(profile_, extension_.get());
 
   ASSERT_EQ(1u, observer.mounts.size());
   EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
 
@@ skipping 13 matching lines @@
   ProvidedFileSystemInterface* const file_system =
       service_->GetProvidedFileSystem(kExtensionId, kFileSystemId);
   ASSERT_TRUE(file_system);
 
   const ObservedEntries* const observed_entries =
       file_system->GetObservedEntries();
   ASSERT_TRUE(observed_entries);
   ASSERT_EQ(1u, observed_entries->size());
 
   const ObservedEntries::const_iterator restored_observed_entry_it =
-      observed_entries->find(fake_observed_entry_.entry_path);
+      observed_entries->find(ObservedEntryKey(fake_observed_entry_.entry_path,
+                                              fake_observed_entry_.recursive));
   ASSERT_NE(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);
 
   service_->RemoveObserver(&observer);
@@ skipping 70 matching lines @@
     EXPECT_EQ(1u, observer.unmounts.size());
     EXPECT_FALSE(registry_->file_system_info());
     EXPECT_FALSE(registry_->observed_entries());
   }
 
   service_->RemoveObserver(&observer);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos