[fsp] Allow to create multiple observers for a directory, up to one per origin.

chrome/browser/chromeos/file_system_provider/registry.cc

Index: chrome/browser/chromeos/file_system_provider/registry.cc
diff --git a/chrome/browser/chromeos/file_system_provider/registry.cc b/chrome/browser/chromeos/file_system_provider/registry.cc
index 58fc872f1478f4abb97a3c9770f6c80bedb17b81..8cac1f576585b081f7746e4539918ed7e7a15a0f 100644
--- a/chrome/browser/chromeos/file_system_provider/registry.cc
+++ b/chrome/browser/chromeos/file_system_provider/registry.cc
@@ -31,6 +31,7 @@ const char kPrefKeyObservedEntries[] = "observed-entries";
 const char kPrefKeyObservedEntryEntryPath[] = "entry-path";
 const char kPrefKeyObservedEntryRecursive[] = "recursive";
 const char kPrefKeyObservedEntryLastTag[] = "last-tag";
+const char kPrefKeyObservedEntryPersistentOrigins[] = "persistent-origins";
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
@@ -72,6 +73,15 @@ void Registry::RememberFileSystem(
         kPrefKeyObservedEntryRecursive, it.second.recursive);
     observed_entry->SetStringWithoutPathExpansion(kPrefKeyObservedEntryLastTag,
                                                   it.second.last_tag);
+    base::ListValue* const persistent_origins_value = new base::ListValue();
+    observed_entry->SetWithoutPathExpansion(
+        kPrefKeyObservedEntryPersistentOrigins, persistent_origins_value);
+    for (const auto& subscriber_it : it.second.subscribers) {
+      // Only persistent subscribers should be stored in persistent storage.
+      // Other ones should not be restired after a restart.
+      if (subscriber_it.second.persistent)
+        persistent_origins_value->AppendString(subscriber_it.first.spec());
+    }
   }
 
   PrefService* const pref_service = profile_->GetPrefs();
@@ -182,6 +192,7 @@ scoped_ptr<Registry::RestoredFileSystems> Registry::RestoreFileSystems(
         std::string entry_path;
         bool recursive = false;
         std::string last_tag;
+        const base::ListValue* persistent_origins = NULL;
 
         if (!observed_entry_value->GetAsDictionary(&observed_entry) ||
             !observed_entry->GetStringWithoutPathExpansion(
@@ -190,8 +201,11 @@ scoped_ptr<Registry::RestoredFileSystems> Registry::RestoreFileSystems(
                 kPrefKeyObservedEntryRecursive, &recursive) ||
             !observed_entry->GetStringWithoutPathExpansion(
                 kPrefKeyObservedEntryLastTag, &last_tag) ||
+            !observed_entry->GetListWithoutPathExpansion(
+                kPrefKeyObservedEntryPersistentOrigins, &persistent_origins) ||
             it.key() != entry_path || entry_path.empty() ||
-            (!options.supports_notify_tag && !last_tag.empty())) {
+            (!options.supports_notify_tag &&
+             (!last_tag.empty() || persistent_origins->GetSize()))) {
           LOG(ERROR) << "Malformed observed entry information in preferences.";
           continue;
         }
@@ -201,6 +215,20 @@ scoped_ptr<Registry::RestoredFileSystems> Registry::RestoreFileSystems(
             base::FilePath::FromUTF8Unsafe(entry_path);
         restored_observed_entry.recursive = recursive;
         restored_observed_entry.last_tag = last_tag;
+        for (base::ListValue::const_iterator persistent_origin_it =

[hirono, 2014/10/27 08:15:15]

nit: for (const auto& it : persistent_origins) for consistency?

[mtomasz, 2014/10/28 06:09:18]

Done.

+                 persistent_origins->begin();
+             persistent_origin_it != persistent_origins->end();
+             ++persistent_origin_it) {
+          std::string origin;
+          if (!(*persistent_origin_it)->GetAsString(&origin)) {
+            LOG(ERROR) << "Malformed subscriber information in preferences.";
+            continue;
+          }
+          const GURL origin_as_gurl(origin);
+          restored_observed_entry.subscribers[origin_as_gurl].origin =
+              origin_as_gurl;
+          restored_observed_entry.subscribers[origin_as_gurl].persistent = true;
+        }
         restored_file_system.observed_entries[ObservedEntryKey(
             base::FilePath::FromUTF8Unsafe(entry_path), recursive)] =
             restored_observed_entry;