Skip to content

Commit

Permalink
Revert "Checkin a version of gmock, modified to use our boost_tuple i…
Browse files Browse the repository at this point in the history
…n VS2005."

This reverts commit 071e95bcdcefcd2cb86c9aed5cb073bbcaa7f2a7.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16931 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
ajwong@chromium.org committed May 26, 2009
1 parent f191d1b commit fe60195
Show file tree
Hide file tree
Showing 90 changed files with 13 additions and 37,532 deletions.
12 changes: 5 additions & 7 deletions base/base.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -674,7 +673,6 @@
'base',
'base_gfx',
'../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
],
'conditions': [
Expand Down
137 changes: 0 additions & 137 deletions base/gmock_unittest.cc

This file was deleted.

1 change: 0 additions & 1 deletion build/all.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
'../printing/printing.gyp:*',
'../sdch/sdch.gyp:*',
'../skia/skia.gyp:*',
'../testing/gmock.gyp:*',
'../testing/gtest.gyp:*',
'../third_party/bzip2/bzip2.gyp:*',
'../third_party/codesighs/codesighs.gyp:*',
Expand Down
22 changes: 0 additions & 22 deletions chrome/chrome.sln
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base_unittests", "..\base\b
{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
{C564F145-9172-42C3-BFCB-6014CA97DBCD} = {C564F145-9172-42C3-BFCB-6014CA97DBCD}
{CD9CA56E-4E94-444C-87D4-58CA1E6F300D} = {CD9CA56E-4E94-444C-87D4-58CA1E6F300D}
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F} = {F9D886ED-B09F-4B74-932F-D8E4691E6B7F}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plugin_tests", "test\plugin\plugin_tests.vcproj", "{A1CAA831-C507-4B2E-87F3-AEC63C9907F9}"
Expand Down Expand Up @@ -1645,9 +1644,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_common", "..\web
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility\utility.vcproj", "{4D2B38E6-65FF-4F97-B88A-E441DF54EBF7}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmock", "..\testing\gmock.vcproj", "{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gmockmain", "..\testing\gmockmain.vcproj", "{1B231A30-92B6-A027-DDBA-A0682336765E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "app_unittests", "..\app\app_unittests.vcproj", "{B4D59AE8-8D2F-97E1-A8E9-6D2826729530}"
ProjectSection(ProjectDependencies) = postProject
Expand Down Expand Up @@ -1769,14 +1765,6 @@ Global
{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Mixed Platforms.Build.0 = Release|Win32
{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.ActiveCfg = Release|Win32
{1846F110-8263-413F-9924-36F64DD8FE41}.Release|Win32.Build.0 = Release|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Win32.ActiveCfg = Debug|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Debug|Win32.Build.0 = Debug|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Mixed Platforms.Build.0 = Release|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Win32.ActiveCfg = Release|Win32
{1B231A30-92B6-A027-DDBA-A0682336765E}.Release|Win32.Build.0 = Release|Win32
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -3075,14 +3063,6 @@ Global
{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Mixed Platforms.Build.0 = Release|Win32
{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.ActiveCfg = Release|Win32
{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7}.Release|Win32.Build.0 = Release|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Win32.ActiveCfg = Debug|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Debug|Win32.Build.0 = Debug|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Mixed Platforms.ActiveCfg = Release|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Mixed Platforms.Build.0 = Release|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Win32.ActiveCfg = Release|Win32
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F}.Release|Win32.Build.0 = Release|Win32
{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
{FA39524D-3067-4141-888D-28A86C66F2B9}.Debug|Win32.ActiveCfg = Debug|Win32
Expand Down Expand Up @@ -3138,7 +3118,6 @@ Global
{1832A374-8A74-4F9E-B536-69A699B3E165} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
{1846F110-8263-413F-9924-36F64DD8FE41} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
{1AFC1EC3-24FA-4260-B099-76319EC9977A} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
{1B231A30-92B6-A027-DDBA-A0682336765E} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
{20A560A0-2CD0-4D9E-A58B-1F24B99C087A} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
{21C76E6E-8B38-44D6-8148-B589C13B9554} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
{21E22961-22BF-4493-BD3A-868F93DA5179} = {B353A6A5-9551-4B76-908E-0F0A9B31E4CE}
Expand Down Expand Up @@ -3295,7 +3274,6 @@ Global
{F54ABC59-5C00-414A-A9BA-BAF26D1699F0} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
{F7790A54-4078-4E4A-8231-818BE9FB1F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
{F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
{F9D886ED-B09F-4B74-932F-D8E4691E6B7F} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
{FA39524D-3067-4141-888D-28A86C66F2B9} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
{FA537565-7B03-4FFC-AF15-F7A979B72E22} = {97555540-8163-4D0F-BCAC-EFA0FFED3453}
{FA660037-EB40-4A43-AA9D-9653C57F2789} = {2325D8C4-8EF5-42AC-8900-492225750DE4}
Expand Down
58 changes: 0 additions & 58 deletions testing/README.chromium

This file was deleted.

20 changes: 0 additions & 20 deletions testing/chromium.patch

This file was deleted.

Loading

0 comments on commit fe60195

Please sign in to comment.