Picks up gtest r314.

src/gmock-internal-utils.cc

@@ -77,8 +77,12 @@ class GoogleTestFailureReporter : public FailureReporterInterface {
  public:
   virtual void ReportFailure(FailureType type, const char* file, int line,
                              const string& message) {
-    AssertHelper(type == FATAL ? TPRT_FATAL_FAILURE : TPRT_NONFATAL_FAILURE,
-                 file, line, message.c_str()) = Message();
+    AssertHelper(type == FATAL ?
+                 TestPartResult::kFatalFailure :
+                 TestPartResult::kNonFatalFailure,
+                 file,
+                 line,
+                 message.c_str()) = Message();
     if (type == FATAL) {
       posix::Abort();
     }

test/gmock-spec-builders_test.cc

@@ -985,7 +985,7 @@ TEST(UnexpectedCallTest, UnsatisifiedPrerequisites) {
   // There should be one non-fatal failure.
   ASSERT_EQ(1, failures.size());
   const ::testing::TestPartResult& r = failures.GetTestPartResult(0);
-  EXPECT_EQ(::testing::TPRT_NONFATAL_FAILURE, r.type());
+  EXPECT_EQ(::testing::TestPartResult::kNonFatalFailure, r.type());
 
   // Verifies that the failure message contains the two unsatisfied
   // pre-requisites but not the satisfied one.