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

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 13 matching lines @@
 namespace file_system_provider {
 
 const char kPrefKeyFileSystemId[] = "file-system-id";
 const char kPrefKeyDisplayName[] = "display-name";
 const char kPrefKeyWritable[] = "writable";
 const char kPrefKeySupportsNotifyTag[] = "supports-notify-tag";
 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(
       prefs::kFileSystemProviderMounted,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 Registry::Registry(Profile* profile) : profile_(profile) {
 }
 
@@ skipping 21 matching lines @@
   for (const auto& it : observed_entries) {
     base::DictionaryValue* const observed_entry = new base::DictionaryValue();
     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);
+    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();
   DCHECK(pref_service);
 
   DictionaryPrefUpdate dict_update(pref_service,
                                    prefs::kFileSystemProviderMounted);
 
   base::DictionaryValue* file_systems_per_extension = NULL;
   if (!dict_update->GetDictionaryWithoutPathExpansion(
@@ skipping 90 matching lines @@
            it.Advance()) {
         const base::Value* observed_entry_value = NULL;
         const base::DictionaryValue* observed_entry = NULL;
         observed_entries->GetWithoutPathExpansion(it.key(),
                                                   &observed_entry_value);
         DCHECK(file_system_value);
 
         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(
                 kPrefKeyObservedEntryEntryPath, &entry_path) ||
             !observed_entry->GetBooleanWithoutPathExpansion(
                 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;
         }
 
         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;
+        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;
       }
     }
     restored_file_systems->push_back(restored_file_system);
   }
 
   return restored_file_systems.Pass();
 }
@@ skipping 27 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