Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
diff --git a/webkit/storage_browser.gyp b/webkit/storage_browser.gyp
index 1bd5214..01f6dcf 100644
--- a/webkit/storage_browser.gyp
+++ b/webkit/storage_browser.gyp
@@ -12,12 +12,12 @@
'<(DEPTH)/base/base.gyp:base',
'<(DEPTH)/base/base.gyp:base_i18n',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
- '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/sql/sql.gyp:sql',
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
'<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
+ '<(DEPTH)/url/url.gyp:url_lib',
'<(DEPTH)/webkit/base/webkit_base.gyp:webkit_base',
'<(DEPTH)/webkit/storage_common.gyp:webkit_storage_common',
],
@@ -202,9 +202,7 @@
'browser/fileapi/syncable/local_file_sync_status.cc',
'browser/fileapi/syncable/local_file_sync_status.h',
'browser/fileapi/syncable/local_origin_change_observer.h',
- 'browser/fileapi/syncable/sync_action.h',
'browser/fileapi/syncable/sync_callbacks.h',
- 'browser/fileapi/syncable/sync_direction.h',
'browser/fileapi/syncable/sync_file_metadata.cc',
'browser/fileapi/syncable/sync_file_metadata.h',
'browser/fileapi/syncable/sync_file_status.h',
@@ -241,22 +239,6 @@
'browser/quota/usage_tracker.cc',
'browser/quota/usage_tracker.h',
],
- 'conditions': [
- ['chromeos==1', {
- 'sources': [
- 'browser/chromeos/fileapi/async_file_stream.h',
- 'browser/chromeos/fileapi/cros_mount_point_provider.cc',
- 'browser/chromeos/fileapi/cros_mount_point_provider.h',
- 'browser/chromeos/fileapi/file_access_permissions.cc',
- 'browser/chromeos/fileapi/file_access_permissions.h',
- 'browser/chromeos/fileapi/file_util_async.h',
- 'browser/chromeos/fileapi/remote_file_system_operation.cc',
- 'browser/chromeos/fileapi/remote_file_system_operation.h',
- 'browser/chromeos/fileapi/remote_file_stream_writer.cc',
- 'browser/chromeos/fileapi/remote_file_stream_writer.h',
- ],
- }],
- ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
},