Picasa import: MediaFileSystemRegistry and misc. plumbing

chrome/browser/media_galleries/media_file_system_registry.cc

Index: chrome/browser/media_galleries/media_file_system_registry.cc
diff --git a/chrome/browser/media_galleries/media_file_system_registry.cc b/chrome/browser/media_galleries/media_file_system_registry.cc
index 200b4f31a3647d81cc823b1e590cdf6b3c7c6414..517ed0e1ab14807a510b2d79d0110c1604abafb1 100644
--- a/chrome/browser/media_galleries/media_file_system_registry.cc
+++ b/chrome/browser/media_galleries/media_file_system_registry.cc
@@ -16,6 +16,7 @@
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/media_galleries/imported_media_gallery_registry.h"
 #include "chrome/browser/media_galleries/media_file_system_context.h"
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
@@ -576,9 +577,18 @@ class MediaFileSystemRegistry::MediaFileSystemContextImpl
     CHECK(path.IsAbsolute());
     CHECK(!path.ReferencesParent());
     std::string fs_name(extension_misc::kMediaFileSystemPathPart);
-    const std::string fsid =
-        IsolatedContext::GetInstance()->RegisterFileSystemForPath(
-            fileapi::kFileSystemTypeNativeMedia, path, &fs_name);
+
+    std::string fsid;
+    if (StorageInfo::IsITunesDevice(device_id)) {
+      NOTIMPLEMENTED();
+    } else if (StorageInfo::IsPicasaDevice(device_id)) {
+      fsid = ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread(
+          path);
+    } else {
+      fsid = IsolatedContext::GetInstance()->RegisterFileSystemForPath(
+          fileapi::kFileSystemTypeNativeMedia, path, &fs_name);
+    }
+
     CHECK(!fsid.empty());
     return fsid;
   }