Make FileSystemURL::ToGURL consistent with DOMFileSystemBase.

webkit/browser/fileapi/file_system_url.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/browser/fileapi/file_system_url.h"
 
 #include <sstream>
 
 #include "base/logging.h"
+#include "base/strings/string_util.h"
+#include "net/base/escape.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 namespace fileapi {
 
 namespace {
 
 }  // namespace
 
 FileSystemURL::FileSystemURL()
@@ skipping 58 matching lines @@
 FileSystemURL::~FileSystemURL() {}
 
 GURL FileSystemURL::ToGURL() const {
   if (!is_valid_)
     return GURL();
 
   std::string url = GetFileSystemRootURI(origin_, mount_type_).spec();
   if (url.empty())
     return GURL();
 
-  url.append(virtual_path_.AsUTF8Unsafe());
+  // Exactly match with DOMFileSystemBase::createFileSystemURL()'s encoding
+  // behavior, where the path is escaped by KURL::encodeWithURLEscapeSequences
+  // which is essentially encodeURIComponent except '/'.
+  std::string escaped = net::EscapeQueryParamValue(
+      virtual_path_.NormalizePathSeparatorsTo('/').AsUTF8Unsafe(),
+      false /* use_plus */);
+  ReplaceSubstringsAfterOffset(&escaped, 0, "%2F", "/");
+  url.append(escaped);
 
   // Build nested GURL.
   return GURL(url);
 }
 
 std::string FileSystemURL::DebugString() const {
   if (!is_valid_)
     return "invalid filesystem: URL";
   std::ostringstream ss;
   ss << GetFileSystemRootURI(origin_, mount_type_);
@@ skipping 36 matching lines @@
   if (lhs.origin_ != rhs.origin_)
     return lhs.origin_ < rhs.origin_;
   if (lhs.type_ != rhs.type_)
     return lhs.type_ < rhs.type_;
   if (lhs.filesystem_id_ != rhs.filesystem_id_)
     return lhs.filesystem_id_ < rhs.filesystem_id_;
   return lhs.path_ < rhs.path_;
 }
 
 }  // namespace fileapi