Update gmock and gtest.

testing/gmock/src/gmock-matchers.cc

Index: testing/gmock/src/gmock-matchers.cc
diff --git a/testing/gmock/src/gmock-matchers.cc b/testing/gmock/src/gmock-matchers.cc
index 79b525d3f937368b6c907190335cdd213839b6d0..0abca708a4509f15ed2716ac8624268fa95b699d 100644
--- a/testing/gmock/src/gmock-matchers.cc
+++ b/testing/gmock/src/gmock-matchers.cc
@@ -83,18 +83,6 @@ int GetParamIndex(const char* param_names[], const string& param_name) {
   return kInvalidInterpolation;
 }
 
-// If *pstr starts with the given prefix, modifies *pstr to be right
-// past the prefix and returns true; otherwise leaves *pstr unchanged
-// and returns false.  None of pstr, *pstr, and prefix can be NULL.
-bool SkipPrefix(const char* prefix, const char** pstr) {
-  const size_t prefix_len = strlen(prefix);
-  if (strncmp(*pstr, prefix, prefix_len) == 0) {
-    *pstr += prefix_len;
-    return true;
-  }
-  return false;
-}
-
 // Helper function used by ValidateMatcherDescription() to format
 // error messages.
 string FormatMatcherDescriptionSyntaxError(const char* description,