Redesigned and refactored ScopedMTPDeviceMapEntry, MTPDeviceMapService & MTPDeviceDelegate classes.

webkit/fileapi/isolated_mount_point_provider.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.
 
 #include "webkit/fileapi/isolated_mount_point_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ skipping 113 matching lines @@
 #if defined(SUPPORT_MTP_DEVICE_FILESYSTEM)
   if (url.type() == kFileSystemTypeDeviceMedia) {
     MTPDeviceMapService* map_service = MTPDeviceMapService::GetInstance();
     MTPDeviceDelegate* device_delegate =
         map_service->GetMTPDeviceDelegate(url.filesystem_id());
     if (!device_delegate) {
       if (error_code)
         *error_code = base::PLATFORM_FILE_ERROR_NOT_FOUND;
       return NULL;
     }
-    operation_context->set_mtp_device_delegate(device_delegate);
+    operation_context->set_mtp_device_delegate(
+        device_delegate->GetAsWeakPtrOnIOThread());
     operation_context->set_task_runner(device_delegate->GetMediaTaskRunner());
     operation_context->set_media_path_filter(media_path_filter_.get());
   }
 #endif
 
   return new LocalFileSystemOperation(context, operation_context.Pass());
 }
 
 webkit_blob::FileStreamReader*
 IsolatedMountPointProvider::CreateFileStreamReader(
@@ skipping 21 matching lines @@
 void IsolatedMountPointProvider::DeleteFileSystem(
     const GURL& origin_url,
     FileSystemType type,
     FileSystemContext* context,
     const DeleteFileSystemCallback& callback) {
   NOTREACHED();
   callback.Run(base::PLATFORM_FILE_ERROR_INVALID_OPERATION);
 }
 
 }  // namespace fileapi