Change media galleries to external file system type to add toURL support

chrome/browser/media_galleries/imported_media_gallery_registry.h

Index: chrome/browser/media_galleries/imported_media_gallery_registry.h
diff --git a/chrome/browser/media_galleries/imported_media_gallery_registry.h b/chrome/browser/media_galleries/imported_media_gallery_registry.h
index 9e7e2a2734276d4019780ceff3900f7a8cfcd5a5..28e1520f90987e0bda43342bac5d4d1b79d54318 100644
--- a/chrome/browser/media_galleries/imported_media_gallery_registry.h
+++ b/chrome/browser/media_galleries/imported_media_gallery_registry.h
@@ -38,16 +38,18 @@ class ImportedMediaGalleryRegistry {
   static ImportedMediaGalleryRegistry* GetInstance();
 
   // Should be called on the UI thread only.
-  std::string RegisterPicasaFilesystemOnUIThread(
-      const base::FilePath& database_path);
+  bool RegisterPicasaFilesystemOnUIThread(const std::string& fs_name,
+                                          const base::FilePath& database_path);
 
-  std::string RegisterITunesFilesystemOnUIThread(
+  bool RegisterITunesFilesystemOnUIThread(
+      const std::string& fs_name,
       const base::FilePath& xml_library_path);
 
-  std::string RegisterIPhotoFilesystemOnUIThread(
+  bool RegisterIPhotoFilesystemOnUIThread(
+      const std::string& fs_name,
       const base::FilePath& xml_library_path);
 
-  bool RevokeImportedFilesystemOnUIThread(const std::string& fsid);
+  bool RevokeImportedFilesystemOnUIThread(const std::string& fs_name);
 
   // Should be called on the MediaTaskRunner thread only.
 #if defined(OS_WIN) || defined(OS_MACOSX)
@@ -68,6 +70,8 @@ class ImportedMediaGalleryRegistry {
   ImportedMediaGalleryRegistry();
   virtual ~ImportedMediaGalleryRegistry();
 
+  base::FilePath ImportedRoot();
+
 #if defined(OS_WIN) || defined(OS_MACOSX)
   void RegisterPicasaFileSystem(const base::FilePath& database_path);
   void RevokePicasaFileSystem();
@@ -81,14 +85,16 @@ class ImportedMediaGalleryRegistry {
   void RevokeIPhotoFileSystem();
 #endif  // defined(OS_MACOSX)
 
+  base::FilePath imported_root_;

[Lei Zhang, 2014/03/20 00:46:26]

Who deletes this folder?

[vandebo (ex-Chrome), 2014/03/20 18:08:53]

Added a delete to the destructor - we don't seem to have a scoped_file that
deletes.

I could use a scoped temp dir and put the temp file inside it if you prefer.

+
 #if defined(OS_WIN) || defined(OS_MACOSX)
   // The data providers are only set or accessed on the task runner thread.
   scoped_ptr<picasa::PicasaDataProvider> picasa_data_provider_;
   scoped_ptr<itunes::ITunesDataProvider> itunes_data_provider_;
 
   // The remaining members are only accessed on the IO thread.
-  std::set<std::string> picasa_fsids_;
-  std::set<std::string> itunes_fsids_;
+  std::set<std::string> picasa_fs_names_;
+  std::set<std::string> itunes_fs_names_;
 
 #ifndef NDEBUG
   base::FilePath picasa_database_path_;
@@ -99,7 +105,7 @@ class ImportedMediaGalleryRegistry {
 #if defined(OS_MACOSX)
   scoped_ptr<iphoto::IPhotoDataProvider> iphoto_data_provider_;
 
-  std::set<std::string> iphoto_fsids_;
+  std::set<std::string> iphoto_fs_names_;
 
 #ifndef NDEBUG
   base::FilePath iphoto_xml_library_path_;