Fix dependency: make file_system_util not depend on FileSystemURL

webkit/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/fileapi/file_system_url.h"
 
 #include <sstream>
 
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 137 matching lines @@
     ss << GetFileSystemTypeString(type_) << "@" << filesystem_id_ << ":";
     ss << path_.value();
     ss << ")";
   } else {
     ss << path_.value();
   }
   return ss.str();
 }
 
 bool FileSystemURL::IsParent(const FileSystemURL& child) const {
-  return origin() == child.origin() &&
-         type() == child.type() &&
-         filesystem_id() == child.filesystem_id() &&
+  return IsInSameFileSystem(child) &&
          path().IsParent(child.path());
 }
 
+bool FileSystemURL::IsInSameFileSystem(const FileSystemURL& other) const {
+  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_;
 }
 
 bool FileSystemURL::Comparator::operator()(const FileSystemURL& lhs,
                                            const FileSystemURL& rhs) const {
   DCHECK(lhs.is_valid_ && rhs.is_valid_);
   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