Fixed bug: we can now handle "a:b" as a file name.

webkit/fileapi/file_system_util.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/file_system_util.h"
 
 #include "build/build_config.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
@@ skipping 74 matching lines @@
     *origin_url = origin;
   if (type)
     *type = file_system_type;
   if (file_path)
     *file_path = FilePath::FromUTF8Unsafe(path).
         NormalizePathSeparators().StripTrailingSeparators();
 
   return true;
 }
 
+//TODO(ericu): Consider removing support for '\', even on Windows, if possible.
+// There's a lot of test code that will need reworking, and we may have trouble
+// with FilePath elsewhere [e.g. DirName and other methods may also need
+// replacement].
+FilePath VirtualPath::BaseName(const FilePath& virtual_path) {
+  FilePath::StringType path = virtual_path.value();
+
+  // Keep everything after the final separator, but if the pathname is only
+  // one character and it's a separator, leave it alone.
+  while (path.size() > 1 && FilePath::IsSeparator(path[path.size() - 1]))
+    path.resize(path.size() - 1);
+  FilePath::StringType::size_type last_separator =
+      path.find_last_of(FilePath::kSeparators);
+  if (last_separator != FilePath::StringType::npos &&
+      last_separator < path.size() - 1)
+    path.erase(0, last_separator + 1);
+
+  return FilePath(path);
+}
+
+void VirtualPath::GetComponents(
+    const FilePath& path, std::vector<FilePath::StringType>* components) {
+  DCHECK(components);
+  if (!components)
+    return;
+  components->clear();
+  if (path.value().empty())
+    return;
+
+  std::vector<FilePath::StringType> ret_val;
+  FilePath current = path;
+  FilePath base;
+
+  // Due to the way things are implemented, FilePath::DirName works here,
+  // whereas FilePath::BaseName doesn't.
+  while (current != current.DirName()) {
+    base = BaseName(current);
+    ret_val.push_back(base.value());
+    current = current.DirName();
+  }
+
+  *components =
+      std::vector<FilePath::StringType>(ret_val.rbegin(), ret_val.rend());
+}
+
 GURL GetFileSystemRootURI(const GURL& origin_url, FileSystemType type) {
   std::string path("filesystem:");
   path += origin_url.spec();
   switch (type) {
   case kFileSystemTypeTemporary:
     path += (kTemporaryDir + 1);  // We don't want the leading slash.
     break;
   case kFileSystemTypePersistent:
     path += (kPersistentDir + 1);  // We don't want the leading slash.
     break;
@@ skipping 67 matching lines @@
       return fileapi::kPersistentName;
     case kFileSystemTypeExternal:
       return fileapi::kExternalName;
     case kFileSystemTypeUnknown:
     default:
       return std::string();
   }
 }
 
 }  // namespace fileapi