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

chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.cc b/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.cc
index da9ac3bd8f7bdb8c26a0794ec0367fcf455302d0..15a50c98a036a5bff6fff6840d4bb2e5a0f0a847 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.h"
 
 #include "base/logging.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 namespace sync_file_system {
 
@@ -14,15 +14,16 @@ RemoteChangeHandler::ChangeQueueItem::ChangeQueueItem()
 
 RemoteChangeHandler::ChangeQueueItem::ChangeQueueItem(
     int64 changestamp,
-    const fileapi::FileSystemURL& url)
-    : changestamp(changestamp), url(url) {}
+    const storage::FileSystemURL& url)
+    : changestamp(changestamp), url(url) {
+}
 
 bool RemoteChangeHandler::ChangeQueueComparator::operator()(
     const ChangeQueueItem& left,
     const ChangeQueueItem& right) {
   if (left.changestamp != right.changestamp)
     return left.changestamp < right.changestamp;
-  return fileapi::FileSystemURL::Comparator()(left.url, right.url);
+  return storage::FileSystemURL::Comparator()(left.url, right.url);
 }
 
 RemoteChangeHandler::RemoteChange::RemoteChange()
@@ -34,14 +35,15 @@ RemoteChangeHandler::RemoteChange::RemoteChange(
     const std::string& resource_id,
     const std::string& md5_checksum,
     const base::Time& updated_time,
-    const fileapi::FileSystemURL& url,
+    const storage::FileSystemURL& url,
     const FileChange& change)
     : changestamp(changestamp),
       resource_id(resource_id),
       md5_checksum(md5_checksum),
       updated_time(updated_time),
       url(url),
-      change(change) {}
+      change(change) {
+}
 
 RemoteChangeHandler::RemoteChange::~RemoteChange() {}
 
@@ -61,9 +63,9 @@ RemoteChangeHandler::RemoteChangeHandler() {}
 RemoteChangeHandler::~RemoteChangeHandler() {}
 
 bool RemoteChangeHandler::GetChange(RemoteChange* remote_change) {
-  const fileapi::FileSystemURL& url = changes_.begin()->url;
+  const storage::FileSystemURL& url = changes_.begin()->url;
   const base::FilePath::StringType& normalized_path =
-      fileapi::VirtualPath::GetNormalizedFilePath(url.path());
+      storage::VirtualPath::GetNormalizedFilePath(url.path());
   DCHECK(ContainsKey(origin_to_changes_map_, url.origin()));
   PathToChangeMap* path_to_change = &origin_to_changes_map_[url.origin()];
   DCHECK(ContainsKey(*path_to_change, normalized_path));
@@ -71,9 +73,8 @@ bool RemoteChangeHandler::GetChange(RemoteChange* remote_change) {
   return true;
 }
 
-bool RemoteChangeHandler::GetChangeForURL(
-    const fileapi::FileSystemURL& url,
-    RemoteChange* remote_change) {
+bool RemoteChangeHandler::GetChangeForURL(const storage::FileSystemURL& url,
+                                          RemoteChange* remote_change) {
   OriginToChangesMap::iterator found_origin =
       origin_to_changes_map_.find(url.origin());
   if (found_origin == origin_to_changes_map_.end())
@@ -81,7 +82,7 @@ bool RemoteChangeHandler::GetChangeForURL(
 
   PathToChangeMap* path_to_change = &found_origin->second;
   PathToChangeMap::iterator found_change = path_to_change->find(
-      fileapi::VirtualPath::GetNormalizedFilePath(url.path()));
+      storage::VirtualPath::GetNormalizedFilePath(url.path()));
   if (found_change == path_to_change->end())
     return false;
 
@@ -91,7 +92,7 @@ bool RemoteChangeHandler::GetChangeForURL(
 
 void RemoteChangeHandler::AppendChange(const RemoteChange& remote_change) {
   base::FilePath::StringType normalized_path =
-      fileapi::VirtualPath::GetNormalizedFilePath(remote_change.url.path());
+      storage::VirtualPath::GetNormalizedFilePath(remote_change.url.path());
 
   PathToChangeMap* path_to_change =
       &origin_to_changes_map_[remote_change.url.origin()];
@@ -111,7 +112,7 @@ void RemoteChangeHandler::AppendChange(const RemoteChange& remote_change) {
 }
 
 bool RemoteChangeHandler::RemoveChangeForURL(
-    const fileapi::FileSystemURL& url) {
+    const storage::FileSystemURL& url) {
   OriginToChangesMap::iterator found_origin =
       origin_to_changes_map_.find(url.origin());
   if (found_origin == origin_to_changes_map_.end())
@@ -119,7 +120,7 @@ bool RemoteChangeHandler::RemoveChangeForURL(
 
   PathToChangeMap* path_to_change = &found_origin->second;
   PathToChangeMap::iterator found_change = path_to_change->find(
-      fileapi::VirtualPath::GetNormalizedFilePath(url.path()));
+      storage::VirtualPath::GetNormalizedFilePath(url.path()));
   if (found_change == path_to_change->end())
     return false;