Upgrade gtest to r267 and gmock to r173.

testing/gmock/Makefile.am

Index: testing/gmock/Makefile.am
diff --git a/testing/gmock/Makefile.am b/testing/gmock/Makefile.am
index 7a821a025b7e9e4f1900479b50c91a74e4a23292..196b92716a3ccfd07b8e5093799ee6ff3d95cf9b 100644
--- a/testing/gmock/Makefile.am
+++ b/testing/gmock/Makefile.am
@@ -135,6 +135,28 @@ check_PROGRAMS += test/gmock_test
 test_gmock_test_SOURCES = test/gmock_test.cc
 test_gmock_test_LDADD = $(GTEST_LIBS) lib/libgmock_main.la
 
+# A sanity test for verifying that Google Mock works when RTTI is
+# disabled.  We pick gmock-spec-builders_test.cc as it exercises all
+# components of Google Mock.
+TESTS += test/gmock_no_rtti_test
+check_PROGRAMS += test/gmock_no_rtti_test
+test_gmock_no_rtti_test_SOURCES = test/gmock-spec-builders_test.cc \
+                                  src/gmock-all.cc
+test_gmock_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
+test_gmock_no_rtti_test_LDADD = $(GTEST_LIBS)
+
+# A sanity test for verifying that Google Mock works with Google
+# Test's TR1 tuple implementation.  We pick
+# gmock-spec-builders_test.cc as it exercises all components of Google
+# Mock.
+TESTS += test/gmock_use_own_tuple_test
+check_PROGRAMS += test/gmock_use_own_tuple_test
+test_gmock_use_own_tuple_test_SOURCES = test/gmock-spec-builders_test.cc \
+                                        src/gmock-all.cc
+test_gmock_use_own_tuple_test_CXXFLAGS = \
+    $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
+test_gmock_use_own_tuple_test_LDADD = $(GTEST_LIBS)
+
 # The following tests depend on the presence of a Python installation and are
 # keyed off of it. We only add them to the TESTS variable when a Python
 # interpreter is available. TODO(chandlerc@google.com): While we currently only