Add overloaded GetProvidedFileSystemInfoList function.

This change adds an overloaded GetProvidedFileSystemInfoList() method
that takes a ProviderId as a parameter, and returns a vector containing
only FileSystemInfo entries for a specific Provider.

This change also modifies the FileSystemProvider API to use this new
function to reduce code duplication.

Bug: chromium:757625
Change-Id: I5426f6768f12a3347aa8b196d2c1804b4f1ed01d
Reviewed-on: https://chromium-review.googlesource.com/986943
Commit-Queue: Bailey Berro <baileyberro@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
Reviewed-by: Zentaro Kavanagh <zentaro@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548134}

chrome/browser/chromeos/extensions/file_system_provider/file_system_provider_api.cc

@@ -186,29 +186,27 @@ ExtensionFunction::ResponseAction FileSystemProviderGetAllFunction::Run() {
       Service::Get(Profile::FromBrowserContext(browser_context()));
   DCHECK(service);
 
+  ProviderId provider_id = ProviderId::CreateFromExtensionId(extension_id());
   const std::vector<ProvidedFileSystemInfo> file_systems =
-      service->GetProvidedFileSystemInfoList();
+      service->GetProvidedFileSystemInfoList(provider_id);
+
   std::vector<FileSystemInfo> items;
 
-  ProviderId provider_id = ProviderId::CreateFromExtensionId(extension_id());
   for (const auto& file_system_info : file_systems) {
-    if (file_system_info.provider_id() == provider_id) {
-      FileSystemInfo item;
-
-      chromeos::file_system_provider::ProvidedFileSystemInterface* const
-          file_system =
-              service->GetProvidedFileSystem(file_system_info.provider_id(),
-                                             file_system_info.file_system_id());
-      DCHECK(file_system);
-
-      FillFileSystemInfo(file_system_info,
-                         file_system_info.watchable()
-                             ? *file_system->GetWatchers()
-                             : Watchers(),
-                         file_system->GetOpenedFiles(), &item);
-
-      items.push_back(std::move(item));
-    }
+    FileSystemInfo item;
+
+    chromeos::file_system_provider::ProvidedFileSystemInterface* const
+        file_system = service->GetProvidedFileSystem(
+            file_system_info.provider_id(), file_system_info.file_system_id());
+
+    DCHECK(file_system);
+
+    FillFileSystemInfo(
+        file_system_info,
+        file_system_info.watchable() ? *file_system->GetWatchers() : Watchers(),
+        file_system->GetOpenedFiles(), &item);
+
+    items.push_back(std::move(item));
   }
 
   return RespondNow(

chrome/browser/chromeos/file_system_provider/service.cc

@@ -275,6 +275,23 @@ std::vector<ProvidedFileSystemInfo> Service::GetProvidedFileSystemInfoList() {
   return result;
 }
 
+std::vector<ProvidedFileSystemInfo> Service::GetProvidedFileSystemInfoList(
+    const ProviderId& provider_id) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
+  const std::vector<ProvidedFileSystemInfo> full_list =
+      GetProvidedFileSystemInfoList();
+  std::vector<ProvidedFileSystemInfo> filtered_list;
+
+  for (const auto& file_system : full_list) {
+    if (file_system.provider_id() == provider_id) {
+      filtered_list.push_back(file_system);
+    }
+  }
+
+  return filtered_list;
+}
+
 ProvidedFileSystemInterface* Service::GetProvidedFileSystem(
     const ProviderId& provider_id,
     const std::string& file_system_id) {

chrome/browser/chromeos/file_system_provider/service.h

@@ -111,6 +111,11 @@ class Service : public KeyedService,
   // items are copied.
   std::vector<ProvidedFileSystemInfo> GetProvidedFileSystemInfoList();
 
+  // Returns a list of information of the currently provided file systems for
+  // |provider_id|. All items are copied.
+  std::vector<ProvidedFileSystemInfo> GetProvidedFileSystemInfoList(
+      const ProviderId& provider_id);
+
   // Returns an immutable map of all registered providers.
   const ProviderMap& GetProviders() const;