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

chrome/browser/media_galleries/imported_media_gallery_registry.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_
 #define CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_
 
 #include <set>
 #include <string>
 
@@ skipping 20 matching lines @@
 // This class lives on the MediaTaskRunner thread. It has some static
 // methods which are called on the UI thread.
 //
 // MediaTaskRunner is not guaranteed to be one thread, but it is guaranteed
 // to be a series of sequential calls. See SequencedTaskRunner for details.
 class ImportedMediaGalleryRegistry {
  public:
   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)
   static picasa::PicasaDataProvider* PicasaDataProvider();
   static itunes::ITunesDataProvider* ITunesDataProvider();
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 #if defined(OS_MACOSX)
   static iphoto::IPhotoDataProvider* IPhotoDataProvider();
 #endif  // defined(OS_MACOSX)
 
  private:
   friend struct base::DefaultLazyInstanceTraits<ImportedMediaGalleryRegistry>;
   friend class iphoto::IPhotoDataProviderTest;
   friend class itunes::ITunesDataProviderTest;
   friend class picasa::PicasaDataProviderTest;
 
   ImportedMediaGalleryRegistry();
   virtual ~ImportedMediaGalleryRegistry();
 
+  base::FilePath ImportedRoot();
+
 #if defined(OS_WIN) || defined(OS_MACOSX)
   void RegisterPicasaFileSystem(const base::FilePath& database_path);
   void RevokePicasaFileSystem();
 
   void RegisterITunesFileSystem(const base::FilePath& xml_library_path);
   void RevokeITunesFileSystem();
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 #if defined(OS_MACOSX)
   void RegisterIPhotoFileSystem(const base::FilePath& xml_library_path);
   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_;
   base::FilePath itunes_xml_library_path_;
 #endif
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 #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_;
 #endif
 #endif  // defined(OS_MACOSX)
 
   DISALLOW_COPY_AND_ASSIGN(ImportedMediaGalleryRegistry);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_GALLERIES_IMPORTED_MEDIA_GALLERY_REGISTRY_H_