[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/registry.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 "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/stl_util.h"
@@ skipping 46 matching lines @@
   file_system->SetBooleanWithoutPathExpansion(
       kPrefKeySupportsNotifyTag, file_system_info.supports_notify_tag());
 
   base::DictionaryValue* const observed_entries_value =
       new base::DictionaryValue();
   file_system->SetWithoutPathExpansion(kPrefKeyObservedEntries,
                                        observed_entries_value);
 
   for (const auto& it : observed_entries) {
     base::DictionaryValue* const observed_entry = new base::DictionaryValue();
-    observed_entries_value->SetWithoutPathExpansion(it.first.value(),
-                                                    observed_entry);
+    observed_entries_value->SetWithoutPathExpansion(
+        it.second.entry_path.value(), observed_entry);
     observed_entry->SetStringWithoutPathExpansion(
         kPrefKeyObservedEntryEntryPath, it.second.entry_path.value());
     observed_entry->SetBooleanWithoutPathExpansion(
         kPrefKeyObservedEntryRecursive, it.second.recursive);
     observed_entry->SetStringWithoutPathExpansion(kPrefKeyObservedEntryLastTag,
                                                   it.second.last_tag);
   }
 
   PrefService* const pref_service = profile_->GetPrefs();
   DCHECK(pref_service);
@@ skipping 115 matching lines @@
             (!options.supports_notify_tag && !last_tag.empty())) {
           LOG(ERROR) << "Malformed observed entry information in preferences.";
           continue;
         }
 
         ObservedEntry restored_observed_entry;
         restored_observed_entry.entry_path =
             base::FilePath::FromUTF8Unsafe(entry_path);
         restored_observed_entry.recursive = recursive;
         restored_observed_entry.last_tag = last_tag;
-        restored_file_system
-            .observed_entries[base::FilePath::FromUTF8Unsafe(entry_path)] =
+        restored_file_system.observed_entries[ObservedEntryKey(
+            base::FilePath::FromUTF8Unsafe(entry_path), recursive)] =
             restored_observed_entry;
       }
     }
     restored_file_systems->push_back(restored_file_system);
   }
 
   return restored_file_systems.Pass();
 }
 
 void Registry::UpdateObservedEntryTag(
@@ skipping 25 matching lines @@
     LOG(ERROR) << "Broken preferences detected while updating a tag.";
     return;
   }
 
   observed_entry_value->SetStringWithoutPathExpansion(
       kPrefKeyObservedEntryLastTag, observed_entry.last_tag);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos