Replace FilePath with base::FilePath.

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"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "webkit/fileapi/file_system_types.h"
 
 namespace fileapi {
 
 const char kPersistentDir[] = "/persistent";
 const char kTemporaryDir[] = "/temporary";
 const char kIsolatedDir[] = "/isolated";
 const char kExternalDir[] = "/external";
 const char kTestDir[] = "/test";
 
-const FilePath::CharType VirtualPath::kRoot[] = FILE_PATH_LITERAL("/");
-const FilePath::CharType VirtualPath::kSeparator = FILE_PATH_LITERAL('/');
+const base::FilePath::CharType VirtualPath::kRoot[] = FILE_PATH_LITERAL("/");
+const base::FilePath::CharType VirtualPath::kSeparator = FILE_PATH_LITERAL('/');
 
 // 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 base::FilePath elsewhere [e.g. DirName and other methods may also need
 // replacement].
 base::FilePath VirtualPath::BaseName(const base::FilePath& virtual_path) {
   base::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.
@@ skipping 26 matching lines @@
   while (current != current.DirName()) {
     base = BaseName(current);
     ret_val.push_back(base.value());
     current = current.DirName();
   }
 
   *components =
       std::vector<base::FilePath::StringType>(ret_val.rbegin(), ret_val.rend());
 }
 
-FilePath::StringType VirtualPath::GetNormalizedFilePath(const FilePath& path) {
-  FilePath::StringType normalized_path = path.value();
-  const size_t num_separators = FilePath::StringType(
-      FilePath::kSeparators).length();
+base::FilePath::StringType VirtualPath::GetNormalizedFilePath(
+    const base::FilePath& path) {
+  base::FilePath::StringType normalized_path = path.value();
+  const size_t num_separators = base::FilePath::StringType(
+      base::FilePath::kSeparators).length();
   for (size_t i = 1; i < num_separators; ++i) {
     std::replace(normalized_path.begin(), normalized_path.end(),
-                 FilePath::kSeparators[i], kSeparator);
+                 base::FilePath::kSeparators[i], kSeparator);
   }
 
   return (IsAbsolute(normalized_path)) ?
-      normalized_path : FilePath::StringType(kRoot) + normalized_path;
+      normalized_path : base::FilePath::StringType(kRoot) + normalized_path;
 }
 
-bool VirtualPath::IsAbsolute(const FilePath::StringType& path) {
+bool VirtualPath::IsAbsolute(const base::FilePath::StringType& path) {
   return path.find(kRoot) == 0;
 }
 
 GURL GetFileSystemRootURI(const GURL& origin_url, FileSystemType type) {
   // origin_url is based on a security origin, so http://foo.com or file:///
   // instead of the corresponding filesystem URL.
   DCHECK(!origin_url.SchemeIsFileSystem());
 
   std::string url = "filesystem:" + origin_url.GetWithEmptyPath().spec();
   switch (type) {
@@ skipping 227 matching lines @@
   root.append("/");
   if (!optional_root_name.empty()) {
     DCHECK(!base::FilePath::FromUTF8Unsafe(optional_root_name).ReferencesParent());
     root.append(optional_root_name);
     root.append("/");
   }
   return root;
 }
 
 }  // namespace fileapi