summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatrick@chromium.org <patrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 17:58:53 +0000
committerpatrick@chromium.org <patrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-20 17:58:53 +0000
commit5ee78e021cf0d67d72db177f330d123bafce53c0 (patch)
tree09ae890bc239072f43f10f25373538e071023e88
parentdfa5c663ad2efad1cc76ad9986f394ac224bc33e (diff)
downloadchromium_src-5ee78e021cf0d67d72db177f330d123bafce53c0.zip
chromium_src-5ee78e021cf0d67d72db177f330d123bafce53c0.tar.gz
chromium_src-5ee78e021cf0d67d72db177f330d123bafce53c0.tar.bz2
Update to Google Test 1.3.0.
Review URL: http://codereview.chromium.org/50041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12197 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--testing/gtest.gyp1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 478b3c2..50e0ddb 100644
--- a/DEPS
+++ b/DEPS
@@ -16,7 +16,7 @@ deps = {
"http://open-vcdiff.googlecode.com/svn/trunk@22",
"src/testing/gtest":
- "http://googletest.googlecode.com/svn/trunk@167",
+ "http://googletest.googlecode.com/svn/trunk@214",
"src/third_party/WebKit":
"/trunk/deps/third_party/WebKit@12118",
diff --git a/testing/gtest.gyp b/testing/gtest.gyp
index acf906b..110fe14 100644
--- a/testing/gtest.gyp
+++ b/testing/gtest.gyp
@@ -34,6 +34,7 @@
'gtest/include/gtest/gtest_pred_impl.h',
'gtest/include/gtest/gtest_prod.h',
'gtest/src/gtest-test-part.cc',
+ 'gtest/src/gtest-typed-test.cc',
'gtest/src/gtest-death-test.cc',
'gtest/src/gtest-filepath.cc',
'gtest/src/gtest-internal-inl.h',