Re-add leveldb test targets to leveldatabase.gyp.

Also update leveldb's README.chromium file.

BUG=110826
TEST=


Review URL: http://codereview.chromium.org/9176014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118583 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 174 insertions, 4 deletions

diff --git a/third_party/leveldatabase/README.chromium b/third_party/leveldatabase/README.chromium
index b9595d5..9232046 100644
--- a/third_party/leveldatabase/README.chromium
+++ b/third_party/leveldatabase/README.chromium
@@ -1,15 +1,15 @@
 Name: LevelDB: A Fast Persistent Key-Value Store
 Short Name: leveldb
 URL: http://code.google.com/p/leveldb/
-Version: r51
+Version: r55
 License: New BSD
 Security Critical: yes
 
 Description:
 Alternative to SQLite used as the backend for IndexedDB and internally by the
-FileSystem API implementation.
+FileSystem API implementation and others.
 
-Local Modifications:
+Local Additions:
 * gyp file for building in chromium
 * port/port_chromium.{h,cc} and env_chromium.cc provide chromium implementations
   of primitives used by leveldb.  E.g. threading, file handling, etc.
diff --git a/third_party/leveldatabase/leveldatabase.gyp b/third_party/leveldatabase/leveldatabase.gyp
index cde2309..db59f77 100644
--- a/third_party/leveldatabase/leveldatabase.gyp
+++ b/third_party/leveldatabase/leveldatabase.gyp
@@ -145,7 +145,177 @@
         ['exclude', '_(android|example|portable|posix)\\.cc$'],
       ],
     },
-    # TODO(dgrogan): Replace the test targets once third_party/leveldb is gone.
+    {
+      'target_name': 'leveldb_testutil',
+      'type': '<(library)',
+      'dependencies': [
+        '../../base/base.gyp:base',
+        'leveldatabase',
+      ],
+      'export_dependent_settings': [
+        # The tests use include directories from these projects.
+        '../../base/base.gyp:base',
+        'leveldatabase',
+      ],
+      'sources': [
+        'src/util/histogram.cc',
+        'src/util/histogram.h',
+        'src/util/testharness.cc',
+        'src/util/testharness.h',
+        'src/util/testutil.cc',
+        'src/util/testutil.h',
+      ],
+    },
+    {
+      'target_name': 'leveldb_arena_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/util/arena_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_cache_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/util/cache_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_coding_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/util/coding_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_corruption_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/corruption_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_crc32c_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/util/crc32c_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_db_bench',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/db_bench.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_db_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/db_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_dbformat_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/dbformat_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_env_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/util/env_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_filename_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/filename_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_log_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/log_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_skiplist_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/skiplist_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_table_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/table/table_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_version_edit_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/version_edit_test.cc',
+      ],
+    },
+    {
+      'target_name': 'leveldb_write_batch_test',
+      'type': 'executable',
+      'dependencies': [
+        'leveldb_testutil',
+      ],
+      'sources': [
+        'src/db/write_batch_test.cc',
+      ],
+    },
   ],
 }