diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 22:05:05 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-26 22:05:05 +0000 |
| commit | fe60195a19a160fa09f76aab21f355e63caa4faa (patch) | |
| tree | 0d7157d0fc8198d799e35a059572d727bebce2ea /base/base.gyp | |
| parent | f191d1bd7601d9be5aea71b1890a85d6e16707dc (diff) | |
| download | chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.zip chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.tar.gz chromium_src-fe60195a19a160fa09f76aab21f355e63caa4faa.tar.bz2 | |
Revert "Checkin a version of gmock, modified to use our boost_tuple in VS2005."
This reverts commit 071e95bcdcefcd2cb86c9aed5cb073bbcaa7f2a7.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/base/base.gyp b/base/base.gyp index a294726..aa168c1 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -590,12 +590,16 @@ 'type': 'executable', 'msvs_guid': '27A30967-4BBA-48D1-8522-CDE95F7B1CEC', 'sources': [ + 'crypto/signature_verifier_unittest.cc', + 'gfx/jpeg_codec_unittest.cc', + 'gfx/native_theme_unittest.cc', + 'gfx/png_codec_unittest.cc', + 'gfx/rect_unittest.cc', 'at_exit_unittest.cc', 'atomicops_unittest.cc', 'clipboard_unittest.cc', 'command_line_unittest.cc', 'condition_variable_unittest.cc', - 'crypto/signature_verifier_unittest.cc', 'data_pack_unittest.cc', 'debug_util_unittest.cc', 'directory_watcher_unittest.cc', @@ -604,11 +608,6 @@ 'file_path_unittest.cc', 'file_util_unittest.cc', 'file_version_info_unittest.cc', - 'gfx/jpeg_codec_unittest.cc', - 'gfx/native_theme_unittest.cc', - 'gfx/png_codec_unittest.cc', - 'gfx/rect_unittest.cc', - 'gmock_unittest.cc', 'histogram_unittest.cc', 'hmac_unittest.cc', 'idletimer_unittest.cc', @@ -674,7 +673,6 @@ 'base', 'base_gfx', '../skia/skia.gyp:skia', - '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', ], 'conditions': [ |