| Index: chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.h
|
| diff --git a/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.h b/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.h
|
| index f2224e4c556b7fe91c604d3988836c56d5f36d06..718d7384fbd18a1fc8e6c629d6fc3c665ed12583 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.h
|
| +++ b/chrome/browser/sync_file_system/drive_backend_v1/remote_change_handler.h
|
| @@ -14,7 +14,7 @@
|
| #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 {
|
|
|
| @@ -26,7 +26,7 @@ class RemoteChangeHandler {
|
| std::string resource_id;
|
| std::string md5_checksum;
|
| base::Time updated_time;
|
| - fileapi::FileSystemURL url;
|
| + storage::FileSystemURL url;
|
| FileChange change;
|
|
|
| RemoteChange();
|
| @@ -34,7 +34,7 @@ class RemoteChangeHandler {
|
| 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();
|
| };
|
| @@ -50,7 +50,7 @@ class RemoteChangeHandler {
|
| 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
|
| @@ -58,7 +58,7 @@ class RemoteChangeHandler {
|
| 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);
|
| @@ -70,11 +70,10 @@ class RemoteChangeHandler {
|
| 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 {
|
|
|