Move storage-related files from webkit/ to new top-level directory storage/

storage/browser/fileapi/file_system_url.cc

Index: storage/browser/fileapi/file_system_url.cc
diff --git a/webkit/browser/fileapi/file_system_url.cc b/storage/browser/fileapi/file_system_url.cc
similarity index 85%
rename from webkit/browser/fileapi/file_system_url.cc
rename to storage/browser/fileapi/file_system_url.cc
index 7e879b3dbba80d9206acd7d9288a58e39b6fa03e..8582ed07f9d09631b65c977845eaf2dc30a3f4e9 100644
--- a/webkit/browser/fileapi/file_system_url.cc
+++ b/storage/browser/fileapi/file_system_url.cc
@@ -2,21 +2,19 @@
 // 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 "storage/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"
+#include "storage/common/fileapi/file_system_types.h"
+#include "storage/common/fileapi/file_system_util.h"
 
-namespace fileapi {
+namespace storage {
 
-namespace {
-
-}  // namespace
+namespace {}  // namespace
 
 FileSystemURL::FileSystemURL()
     : is_valid_(false),
@@ -40,8 +38,8 @@ FileSystemURL::FileSystemURL(const GURL& url)
     : mount_type_(kFileSystemTypeUnknown),
       type_(kFileSystemTypeUnknown),
       mount_option_(COPY_SYNC_OPTION_NO_SYNC) {
-  is_valid_ = ParseFileSystemSchemeURL(url, &origin_, &mount_type_,
-                                       &virtual_path_);
+  is_valid_ =
+      ParseFileSystemSchemeURL(url, &origin_, &mount_type_, &virtual_path_);
   path_ = virtual_path_;
   type_ = mount_type_;
 }
@@ -77,7 +75,8 @@ FileSystemURL::FileSystemURL(const GURL& origin,
       mount_option_(mount_option) {
 }
 
-FileSystemURL::~FileSystemURL() {}
+FileSystemURL::~FileSystemURL() {
+}
 
 GURL FileSystemURL::ToGURL() const {
   if (!is_valid_)
@@ -120,22 +119,18 @@ std::string FileSystemURL::DebugString() const {
 }
 
 bool FileSystemURL::IsParent(const FileSystemURL& child) const {
-  return IsInSameFileSystem(child) &&
-         path().IsParent(child.path());
+  return IsInSameFileSystem(child) && path().IsParent(child.path());
 }
 
 bool FileSystemURL::IsInSameFileSystem(const FileSystemURL& other) const {
-  return origin() == other.origin() &&
-         type() == other.type() &&
+  return origin() == other.origin() && type() == other.type() &&
          filesystem_id() == other.filesystem_id();
 }
 
 bool FileSystemURL::operator==(const FileSystemURL& that) const {
-  return origin_ == that.origin_ &&
-      type_ == that.type_ &&
-      path_ == that.path_ &&
-      filesystem_id_ == that.filesystem_id_ &&
-      is_valid_ == that.is_valid_;
+  return origin_ == that.origin_ && type_ == that.type_ &&
+         path_ == that.path_ && filesystem_id_ == that.filesystem_id_ &&
+         is_valid_ == that.is_valid_;
 }
 
 bool FileSystemURL::Comparator::operator()(const FileSystemURL& lhs,
@@ -150,4 +145,4 @@ bool FileSystemURL::Comparator::operator()(const FileSystemURL& lhs,
   return lhs.path_ < rhs.path_;
 }
 
-}  // namespace fileapi
+}  // namespace storage