[Media Galleries] Introduce a new type for Mac Image Capture.

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 <vector>
@@ skipping 317 matching lines @@
 
       PrefIdFsInfoMap::const_iterator existing_info =
           pref_id_map_.find(pref_id);
       if (existing_info != pref_id_map_.end()) {
         result.push_back(existing_info->second);
         new_galleries.insert(pref_id);
         continue;
       }
 
       FilePath path = gallery_info.AbsolutePath();
-      if (!path.IsAbsolute())
+      if (!MediaStorageUtil::CanCreateFileSystem(device_id, path))
         continue;
 
       std::string fsid;
       if (MediaStorageUtil::IsMassStorageDevice(device_id)) {
         fsid = file_system_context_->RegisterFileSystemForMassStorage(
             device_id, path);
       } else {
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
+        LOG(INFO) << "Getting MTP fs for " << path.value();

[Lei Zhang, 2012/12/10 21:53:41]

Remove these debugging statements?

[Greg Billock, 2012/12/10 22:39:41]

Done.

         scoped_refptr<ScopedMTPDeviceMapEntry> mtp_device_host;
         fsid = file_system_context_->RegisterFileSystemForMTPDevice(
             device_id, path, &mtp_device_host);
         DCHECK(mtp_device_host.get());
         media_device_map_references_[pref_id] = mtp_device_host;
 #else
         NOTIMPLEMENTED();
         continue;
 #endif
       }
@@ skipping 276 matching lines @@
   }
 
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   virtual std::string RegisterFileSystemForMTPDevice(
       const std::string& device_id, const FilePath& path,
       scoped_refptr<ScopedMTPDeviceMapEntry>* entry) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DCHECK(!MediaStorageUtil::IsMassStorageDevice(device_id));
 
     // Sanity checks for |path|.
-    CHECK(path.IsAbsolute());
-    CHECK(!path.ReferencesParent());
+    CHECK(MediaStorageUtil::CanCreateFileSystem(device_id, path));
     std::string fs_name(extension_misc::kMediaFileSystemPathPart);
     const std::string fsid =
         IsolatedContext::GetInstance()->RegisterFileSystemForPath(
             fileapi::kFileSystemTypeDeviceMedia, path, &fs_name);
+    LOG(INFO) << "Registered for type device-media : " << path.value();
     CHECK(!fsid.empty());
     DCHECK(entry);
     *entry = registry_->GetOrCreateScopedMTPDeviceMapEntry(path.value());
     return fsid;
   }
 #endif
 
   virtual void RevokeFileSystem(const std::string& fsid) {
     IsolatedContext::GetInstance()->RevokeFileSystem(fsid);
   }
@@ skipping 98 matching lines @@
 
     PrefChangeRegistrarMap::iterator pref_it =
         pref_change_registrar_map_.find(profile);
     DCHECK(pref_it != pref_change_registrar_map_.end());
     delete pref_it->second;
     pref_change_registrar_map_.erase(pref_it);
   }
 }
 
 }  // namespace chrome