Files.app: Enable externalfile: protocol for MTP volumes.

chrome/browser/chromeos/fileapi/external_file_url_request_job.cc

 // Copyright 2014 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 "chrome/browser/chromeos/fileapi/external_file_url_request_job.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 19 matching lines @@
 #include "storage/browser/fileapi/file_system_operation_runner.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 namespace {
 
 const char kMimeTypeForRFC822[] = "message/rfc822";
 const char kMimeTypeForMHTML[] = "multipart/related";
 
-// Check if the |url| points a valid location or not.
-bool IsValidURL(const storage::FileSystemURL& url) {
-  switch (url.type()) {
-    case storage::kFileSystemTypeDrive: {
-      const base::FilePath my_drive_path =
-          drive::util::GetDriveMyDriveRootPath();
-      const base::FilePath drive_other_path =
-          drive::util::GetDriveGrandRootPath().Append(
-              drive::util::kDriveOtherDirName);
-      const base::FilePath url_drive_path =
-          drive::util::ExtractDrivePathFromFileSystemUrl(url);
-      return my_drive_path == url_drive_path ||
-             my_drive_path.IsParent(url_drive_path) ||
-             drive_other_path.IsParent(url_drive_path);
-    }
-    default:
-      return false;
-  }
-}
-
 // Helper for obtaining FileSystemContext, FileSystemURL, and mime type on the
 // UI thread.
 class URLHelper {
  public:
   // The scoped pointer to control lifetime of the instance itself. The pointer
   // is passed to callback functions and binds the lifetime of the instance to
   // the callback's lifetime.
   typedef scoped_ptr<URLHelper> Lifetime;
 
   URLHelper(void* profile_id,
@@ skipping 19 matching lines @@
     }
     content::StoragePartition* const storage =
         content::BrowserContext::GetStoragePartitionForSite(profile, url_);
     DCHECK(storage);
 
     scoped_refptr<storage::FileSystemContext> context =
         storage->GetFileSystemContext();
     DCHECK(context.get());
 
     // Obtain the absolute path in the file system.
-    base::FilePath path = drive::util::GetDriveMountPointPath(profile);
-    drive::util::GetDriveGrandRootPath().AppendRelativePath(
-        ExternalFileURLToFilePath(url_), &path);
-
-    storage::ExternalFileSystemBackend* const backend =
-        context->external_backend();
-    DCHECK(backend);
-
-    // Obtain the virtual path.
-    base::FilePath virtual_path;
-    if (!backend->GetVirtualPath(path, &virtual_path)) {
-      ReplyResult(net::ERR_FILE_NOT_FOUND);
-      return;
-    }
+    const base::FilePath virtual_path = ExternalFileURLToVirtualPath(url_);
 
     // Obtain the file system URL.
     // TODO(hirono): After removing MHTML support, stop to use the special
-
     // drive: scheme and use filesystem: URL directly.  crbug.com/415455
     file_system_url_ = context->CreateCrackedFileSystemURL(
         GURL(std::string(chrome::kExternalFileScheme) + ":"),
         storage::kFileSystemTypeExternal,
         virtual_path);
-    if (!IsValidURL(file_system_url_)) {
+
+    // Check if the obtained path providing external file URL or not.
+    if (FileSystemURLToExternalFileURL(file_system_url_).is_empty()) {
       ReplyResult(net::ERR_INVALID_URL);
       return;
     }
 
     file_system_context_ = context;
 
     extensions::app_file_handler_util::GetMimeTypeForLocalPath(
         profile,
         file_system_url_.path(),
         base::Bind(&URLHelper::OnGotMimeTypeOnUIThread,
@@ skipping 247 matching lines @@
     NotifyDone(
         net::URLRequestStatus(net::URLRequestStatus::FAILED, read_result));
   }
 
   remaining_bytes_ -= read_result;
   SetStatus(net::URLRequestStatus());  // Clear the IO_PENDING status.
   NotifyReadComplete(read_result);
 }
 
 }  // namespace chromeos