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

chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h
index a960da356a3886bb863d21f0140ae15c59e148d1..e25e885ed291eecc6c3f3ec6f884b91fa21d32dd 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store.h
@@ -18,7 +18,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/sync_file_system/sync_callbacks.h"
 #include "chrome/browser/sync_file_system/sync_status_code.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 namespace base {
 class ListValue;
@@ -47,7 +47,7 @@ class DriveMetadataStore
   typedef std::map<std::string, GURL> OriginByResourceId;
   typedef std::map<base::FilePath, DriveMetadata> PathToMetadata;
   typedef std::map<GURL, PathToMetadata> MetadataMap;
-  typedef std::vector<std::pair<fileapi::FileSystemURL, DriveMetadata> >
+  typedef std::vector<std::pair<storage::FileSystemURL, DriveMetadata> >
       URLAndDriveMetadataList;
   typedef base::Callback<void(SyncStatusCode status, bool created)>
       InitializationCallback;
@@ -67,16 +67,16 @@ class DriveMetadataStore
   int64 GetLargestChangeStamp() const;
 
   // Updates database entry. Invokes |callback|, upon completion.
-  void UpdateEntry(const fileapi::FileSystemURL& url,
+  void UpdateEntry(const storage::FileSystemURL& url,
                    const DriveMetadata& metadata,
                    const SyncStatusCallback& callback);
 
   // Deletes database entry for |url|. Invokes |callback|, upon completion.
-  void DeleteEntry(const fileapi::FileSystemURL& url,
+  void DeleteEntry(const storage::FileSystemURL& url,
                    const SyncStatusCallback& callback);
 
   // Lookups and reads the database entry for |url|.
-  SyncStatusCode ReadEntry(const fileapi::FileSystemURL& url,
+  SyncStatusCode ReadEntry(const storage::FileSystemURL& url,
                            DriveMetadata* metadata) const;
 
   // Marks |origin| as incremental sync and associates it with the directory
@@ -112,8 +112,7 @@ class DriveMetadataStore
                               const std::string& resource_id);
 
   // Returns a set of URLs for files in conflict.
-  SyncStatusCode GetConflictURLs(
-      fileapi::FileSystemURLSet* urls) const;
+  SyncStatusCode GetConflictURLs(storage::FileSystemURLSet* urls) const;
 
   // Returns a set of URLs and Resource IDs for files to be fetched.
   SyncStatusCode GetToBeFetchedFiles(URLAndDriveMetadataList* list) const;