Files.app: Stop to use file system URLs having externalfile:// scheme origin internally.

chrome/browser/chromeos/fileapi/external_file_url_util.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_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/file_manager/app_id.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/base/escape.h"
 #include "storage/browser/fileapi/file_system_url.h"
 
 using content::BrowserThread;
 
 namespace chromeos {
 
+bool IsExternalFileURLType(storage::FileSystemType type) {
+  return type == storage::kFileSystemTypeDrive ||
+         type == storage::kFileSystemTypeDeviceMediaAsFileStorage ||
+         type == storage::kFileSystemTypeProvided;
+}
+
 GURL FileSystemURLToExternalFileURL(
     const storage::FileSystemURL& file_system_url) {
-  if (file_system_url.mount_type() != storage::kFileSystemTypeExternal)
+  if (file_system_url.mount_type() != storage::kFileSystemTypeExternal ||
+      !IsExternalFileURLType(file_system_url.type())) {
     return GURL();
+  }
 
-  switch (file_system_url.type()) {
-    case storage::kFileSystemTypeDrive:
-    case storage::kFileSystemTypeDeviceMediaAsFileStorage:
-    case storage::kFileSystemTypeProvided:
-      return GURL(base::StringPrintf(
-          "%s:%s",
-          chrome::kExternalFileScheme,
-          file_system_url.virtual_path().AsUTF8Unsafe().c_str()));
-
-    default:
-      return GURL();
-  }
+  return GURL(base::StringPrintf(
+      "%s:%s",
+      chrome::kExternalFileScheme,
+      file_system_url.virtual_path().AsUTF8Unsafe().c_str()));

[mtomasz, 2014/09/29 12:47:40]

Sorry for not catching earlier, but does this properly escape characters such as
? & and so on?

[hirono, 2014/09/29 13:24:02]

Yes we needed to this. It seems an issue from the drive scheme URL.
Actually we can open files having such name, because url.GetContent at #50
returns the raw string of URL.

One problem I found is URL is not shown correctly in the location bar after
clicking <a href="#hash">Link</a> if the file name includes '#'.

Let me handle the issue in the separated CL.

 }
 
 base::FilePath ExternalFileURLToVirtualPath(const GURL& url) {
   if (!url.is_valid() || url.scheme() != chrome::kExternalFileScheme)
     return base::FilePath();
   const std::string path_string =
       net::UnescapeURLComponent(url.GetContent(), net::UnescapeRule::NORMAL);
   return base::FilePath::FromUTF8Unsafe(path_string);
 }
 
@@ skipping 14 matching lines @@
       file_manager::util::GetFileSystemContextForExtensionId(
           profile, file_manager::kFileManagerAppId)
           ->CrackURL(raw_file_system_url);
   if (!file_system_url.is_valid())
     return GURL();
 
   return FileSystemURLToExternalFileURL(file_system_url);
 }
 
 }  // namespace chromeos