Update gmock and gtest.

testing/gmock/src/gmock-matchers.cc

 // Copyright 2007, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 65 matching lines @@
   if (param_name == "*")
     return kTupleInterpolation;
 
   for (int i = 0; param_names[i] != NULL; i++) {
     if (param_name == param_names[i])
       return i;
   }
   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,
                                            const char* error_pos) {
   ::std::stringstream ss;
   ss << "Syntax error at index " << (error_pos - description)
      << " in matcher description \"" << description << "\": ";
   return ss.str();
 }
 
@@ skipping 85 matching lines @@
       last_interp_end = interp[i].end_pos;
     }
     result += last_interp_end;
   }
 
   return result;
 }
 
 }  // namespace internal
 }  // namespace testing