Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1122)

Unified Diff: content/content_tests.gypi

Issue 11274003: webkit: Merge 'database' and 'quota' to 'webkit_storage' (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More EXPORT for Win Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_common.gypi ('k') | webkit/database/database_connections.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 93fa630c3f03a2624da30eac2453465c0a2b6653..ffc7a5476cde0d74140f6a3ecb0df7a1483495c8 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -236,6 +236,7 @@
'../media/media.gyp:media_test_support',
'../net/net.gyp:net_test_support',
'../skia/skia.gyp:skia',
+ '../sql/sql.gyp:sql',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/ui.gyp:ui',
@@ -395,7 +396,6 @@
'../webkit/database/databases_table_unittest.cc',
'../webkit/database/database_tracker_unittest.cc',
'../webkit/database/database_util_unittest.cc',
- '../webkit/database/quota_table_unittest.cc',
'../webkit/dom_storage/dom_storage_area_unittest.cc',
'../webkit/dom_storage/dom_storage_cached_area_unittest.cc',
'../webkit/dom_storage/dom_storage_context_unittest.cc',
@@ -493,9 +493,7 @@
'<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
'../ui/gl/gl.gyp:gl',
'../v8/tools/gyp/v8.gyp:v8',
- '../webkit/support/webkit_support.gyp:database',
'../webkit/support/webkit_support.gyp:glue',
- '../webkit/support/webkit_support.gyp:quota',
'../webkit/support/webkit_support.gyp:webkit_base',
'../webkit/support/webkit_support.gyp:webkit_media',
'../webkit/support/webkit_support.gyp:webkit_storage',
« no previous file with comments | « content/content_common.gypi ('k') | webkit/database/database_connections.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698