Plumb file system name down from MediaFileSystemRegistry.

chrome/browser/media_gallery/media_file_system_registry.cc

 // Copyright (c) 2012 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.
 
 // MediaFileSystemRegistry implementation.
 
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 
 #include <set>
 
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/system_monitor/system_monitor.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/isolated_context.h"
 
 namespace chrome {
 
@@ skipping 23 matching lines @@
 
 /******************
  * Public methods
  ******************/
 
 // static
 MediaFileSystemRegistry* MediaFileSystemRegistry::GetInstance() {
   return g_media_file_system_registry.Pointer();
 }
 
-std::vector<MediaFileSystemRegistry::MediaFSIDAndPath>
-MediaFileSystemRegistry::GetMediaFileSystems(
+std::vector<MediaFileSystemRegistry::MediaFSInfo>
+MediaFileSystemRegistry::GetMediaFileSystemsForExtension(
     const content::RenderProcessHost* rph,
     const extensions::Extension& extension) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  std::vector<MediaFSIDAndPath> results;
+  std::vector<MediaFSInfo> results;
   std::pair<ChildIdToMediaFSMap::iterator, bool> ret =
       media_fs_map_.insert(std::make_pair(rph, MediaPathToFSIDMap()));
   ChildIdToMediaFSMap::iterator& child_it = ret.first;
   if (ret.second) {
     // Never seen a GetMediaFileSystems call from this RPH. Initialize its
     // file system mappings.
     RegisterForRPHGoneNotifications(rph);
     FilePath pictures_path;
     // TODO(vandebo) file system galleries need a unique id as well.
     if (PathService::Get(chrome::DIR_USER_PICTURES, &pictures_path) &&
@@ skipping 16 matching lines @@
       device_id_map_.insert(std::make_pair(media_devices[i].unique_id, path));
       const std::string fsid = RegisterPathAsFileSystem(path);
       child_it->second.insert(std::make_pair(path, fsid));
     }
   }
 
   MediaPathToFSIDMap& child_map = child_it->second;
   for (MediaPathToFSIDMap::const_iterator it = child_map.begin();
        it != child_map.end();
        ++it) {
-    const FilePath path = it->first;
-    const std::string fsid = it->second;
-    results.push_back(std::make_pair(fsid, path));
+    MediaFSInfo entry;
+    // TODO(vandebo) use a better name, fsid for now.
+    entry.name = it->second;
+    entry.fsid = it->second;
+    entry.path = it->first;
+    results.push_back(entry);
   }
   return results;
 }
 
 void MediaFileSystemRegistry::OnMediaDeviceDetached(const std::string& id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DeviceIdToMediaPathMap::iterator it = device_id_map_.find(id);
   if (it == device_id_map_.end())
     return;
@@ skipping 48 matching lines @@
 std::string MediaFileSystemRegistry::RegisterPathAsFileSystem(
     const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Sanity checks for |path|.
   CHECK(path.IsAbsolute());
   CHECK(!path.ReferencesParent());
 
   // The directory name is not exposed to the js layer and we simply use
   // a fixed name (as we only register a single directory per file system).
-  std::string register_name("_");
+  std::string register_name(extension_misc::kMediaFileSystemPathPart);
   const std::string fsid =
       IsolatedContext::GetInstance()->RegisterFileSystemForPath(
           fileapi::kFileSystemTypeIsolated, path, &register_name);
   CHECK(!fsid.empty());
   return fsid;
 }
 
 void MediaFileSystemRegistry::RevokeMediaFileSystem(const FilePath& path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   IsolatedContext* isolated_context = IsolatedContext::GetInstance();
   for (ChildIdToMediaFSMap::iterator child_it = media_fs_map_.begin();
        child_it != media_fs_map_.end();
        ++child_it) {
     MediaPathToFSIDMap& child_map = child_it->second;
     MediaPathToFSIDMap::iterator media_path_it = child_map.find(path);
     if (media_path_it == child_map.end())
       continue;
     isolated_context->RevokeFileSystem(media_path_it->second);
     child_map.erase(media_path_it);
   }
 }
 
 }  // namespace chrome