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

chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.h

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_REMOTE_CHANGE_HANDLER_H_
 #define CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_REMOTE_CHANGE_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/stl_util.h"
 #include "base/time/time.h"
 #include "chrome/browser/sync_file_system/file_change.h"
-#include "webkit/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_url.h"
 
 namespace sync_file_system {
 
 // Manages pending remote file changes.
 class RemoteChangeHandler {
  public:
   struct RemoteChange {
     int64 changestamp;
     std::string resource_id;
     std::string md5_checksum;
     base::Time updated_time;
-    fileapi::FileSystemURL url;
+    storage::FileSystemURL url;
     FileChange change;
 
     RemoteChange();
     RemoteChange(int64 changestamp,
                  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);
     ~RemoteChange();
   };
 
   struct RemoteChangeComparator {
     bool operator()(const RemoteChange& left, const RemoteChange& right);
   };
 
   RemoteChangeHandler();
   virtual ~RemoteChangeHandler();
 
   // Pushes the next change into |remote_change| and returns true.
   bool GetChange(RemoteChange* remote_change);
 
   // Pushes the change for the |url| into |remote_change| and returns true.
-  bool GetChangeForURL(const fileapi::FileSystemURL& url,
+  bool GetChangeForURL(const storage::FileSystemURL& url,
                        RemoteChange* remote_change);
 
   // Appends |remote_change| into the change queue. |remote_change| overrides an
   // existing change for the same URL if exists.
   void AppendChange(const RemoteChange& remote_change);
 
   // Removes a change for the |url|.
-  bool RemoveChangeForURL(const fileapi::FileSystemURL& url);
+  bool RemoveChangeForURL(const storage::FileSystemURL& url);
 
   // Removes changes for the |origin|.
   void RemoveChangesForOrigin(const GURL& origin);
 
   bool HasChangesForOrigin(const GURL& origin) const;
   bool HasChanges() const { return !changes_.empty(); }
   size_t ChangesSize() const { return changes_.size(); }
 
  private:
   struct ChangeQueueItem {
     int64 changestamp;
-    fileapi::FileSystemURL url;
+    storage::FileSystemURL url;
 
     ChangeQueueItem();
-    ChangeQueueItem(int64 changestamp,
-                    const fileapi::FileSystemURL& url);
+    ChangeQueueItem(int64 changestamp, const storage::FileSystemURL& url);
   };
 
   struct ChangeQueueComparator {
     bool operator()(const ChangeQueueItem& left, const ChangeQueueItem& right);
   };
 
   typedef std::set<ChangeQueueItem, ChangeQueueComparator> PendingChangeQueue;
 
   struct ChangeMapItem {
     RemoteChange remote_change;
@@ skipping 12 matching lines @@
 
   PendingChangeQueue changes_;
   OriginToChangesMap origin_to_changes_map_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteChangeHandler);
 };
 
 }  // namespace sync_file_system
 
 #endif  // CHROME_BROWSER_SYNC_FILE_SYSTEM_DRIVE_BACKEND_V1_REMOTE_CHANGE_HANDLER_H_