| Index: trunk/src/webkit/fileapi/syncable/canned_syncable_file_system.cc
|
| ===================================================================
|
| --- trunk/src/webkit/fileapi/syncable/canned_syncable_file_system.cc (revision 200830)
|
| +++ trunk/src/webkit/fileapi/syncable/canned_syncable_file_system.cc (working copy)
|
| @@ -13,9 +13,9 @@
|
| #include "base/task_runner_util.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "webkit/blob/mock_blob_url_request_context.h"
|
| -#include "webkit/browser/fileapi/file_system_mount_point_provider.h"
|
| #include "webkit/fileapi/external_mount_points.h"
|
| #include "webkit/fileapi/file_system_context.h"
|
| +#include "webkit/fileapi/file_system_mount_point_provider.h"
|
| #include "webkit/fileapi/file_system_operation_context.h"
|
| #include "webkit/fileapi/file_system_task_runners.h"
|
| #include "webkit/fileapi/local_file_system_operation.h"
|
|
|
| Property changes on: trunk/src/webkit/fileapi/syncable/canned_syncable_file_system.cc
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/src/webkit/fileapi/syncable/canned_syncable_file_system.cc:r3734-4217,4606-5108,5177-5263
|
|
|
|
|