String->URL cleanup, chromium-side.

webkit/fileapi/file_system_util.cc

 // Copyright (c) 2011 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/file_system_util.h"
 
 #include "build/build_config.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 
 bool CrackFileSystemURL(const GURL& url, GURL* origin_url, FileSystemType* type,
                         FilePath* file_path) {
   GURL origin;
   FileSystemType file_system_type;
 
   if (url.scheme() != "filesystem")
     return false;
 
   std::string temp = url.path();
-  // TODO(ericu) remove this code when that ceases to be true, which should be
-  // soon.
+  // TODO(ericu) remove this code when that ceases to be true, which will be as
+  // soon as the WEBFILESYSTEMCALLBACKS_USE_URL_NOT_STRING macro goes into
+  // WebKit.
   // On Windows, this will have backslashes for now.
   // url will look something like:
   //    filesystem:http://example.com/temporary/\dir\file.txt
   // temp will look something like:
   //    http://example.com/temporary/\dir\file.txt
   // On posix, url will look something like:
   //    filesystem:http://example.com/temporary/dir/file.txt
   // temp will look something like:
   //    http://example.com/temporary/dir/file.txt
   size_t pos = temp.find('\\');
   for (; pos != std::string::npos; pos = temp.find('\\', pos + 1)) {
     temp[pos] = '/';
   }
   // TODO(ericu): This should probably be done elsewhere after the stackable
   // layers are properly in.  We're supposed to reject any paths that contain
   // '..' segments, but the GURL constructor is helpfully resolving them for us.
   // Make sure there aren't any before we call it.
   pos = temp.find("..");
   for (; pos != std::string::npos; pos = temp.find("..", pos + 1)) {
     if ((pos == 0 || temp[pos - 1] == '/') &&
         (pos == temp.length() - 2 || temp[pos + 2] == '/'))
       return false;
   }
 
   // bare_url will look something like:
-  //    http://example.com/temporary//dir/file.txt [on Windows; the double slash
-  //    before dir will be single on posix].
+  //    http://example.com/temporary/dir/file.txt.
   GURL bare_url(temp);
 
   // The input URL was malformed, bail out early.
   if (bare_url.path().empty())
     return false;
 
   origin = bare_url.GetOrigin();
 
   // The input URL was malformed, bail out early.
   if (origin.is_empty())
@@ skipping 93 matching lines @@
 
   // We need this work-around for file:/// URIs as
   // createFromDatabaseIdentifier returns empty origin_url for them.
   if (origin_url.spec().empty() &&
       origin_identifier.find("file__") == 0)
     return GURL("file:///");
   return origin_url;
 }
 
 }  // namespace fileapi