summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 22:11:09 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-04 22:11:09 +0000
commitfe2c7f0cb1d2513e357f3c840bb1aa00739aafdf (patch)
tree89ee8d0bfa4dce1def45f83d08ad8e3cc61544f4 /o3d
parenta2d21378c019c424ce1d289974b6b4644562f0f8 (diff)
downloadchromium_src-fe2c7f0cb1d2513e357f3c840bb1aa00739aafdf.zip
chromium_src-fe2c7f0cb1d2513e357f3c840bb1aa00739aafdf.tar.gz
chromium_src-fe2c7f0cb1d2513e357f3c840bb1aa00739aafdf.tar.bz2
Switch to chrome gmock.
I build this on osx and it worked so it should be find on Windows. Windows is not currently using gmock so it should still work there as well. Review URL: http://codereview.chromium.org/194030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/DEPS3
1 files changed, 2 insertions, 1 deletions
diff --git a/o3d/DEPS b/o3d/DEPS
index 68d064d..417c875 100644
--- a/o3d/DEPS
+++ b/o3d/DEPS
@@ -2,6 +2,7 @@ vars = {
"chromium_trunk":
"http://src.chromium.org/svn/trunk",
"nixysa_rev": "29",
+ "chromium_rev": "22547",
"o3d_code_rev": "145",
"skia_rev": "279",
"gyp_rev": "606",
@@ -96,7 +97,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@" + Var("gtest_rev"),
"o3d/third_party/gmock/files":
- "http://googlemock.googlecode.com/svn/tags/release-1.0.0",
+ Var("chromium_trunk") + "/src/testing/gmock@" + Var("chromium_rev"),
"tools/gyp":
"http://gyp.googlecode.com/svn/trunk@" + Var("gyp_rev"),