Update gmock and gtest.

testing/gmock/test/gmock_output_test_.cc

 // Copyright 2008, 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 31 matching lines @@
 using testing::_;
 using testing::AnyNumber;
 using testing::Ge;
 using testing::InSequence;
 using testing::Ref;
 using testing::Return;
 using testing::Sequence;
 
 class MockFoo {
  public:
+  MockFoo() {}
+
   MOCK_METHOD3(Bar, char(const std::string& s, int i, double x));
   MOCK_METHOD2(Bar2, bool(int x, int y));
   MOCK_METHOD2(Bar3, void(int x, int y));
+
+ private:
+  GTEST_DISALLOW_COPY_AND_ASSIGN_(MockFoo);
 };
 
 class GMockOutputTest : public testing::Test {
  protected:
   MockFoo foo_;
 };
 
 TEST_F(GMockOutputTest, ExpectedCall) {
   testing::GMOCK_FLAG(verbose) = "info";
 
@@ skipping 89 matching lines @@
       .InSequence(s2);
   EXPECT_CALL(foo_, Bar2(1, _))
       .InSequence(s1, s2);
 
   foo_.Bar2(1, 0);  // Has two immediate unsatisfied pre-requisites
   foo_.Bar("Hi", 0, 0);
   foo_.Bar2(0, 0);
   foo_.Bar2(1, 0);
 }
 
+TEST_F(GMockOutputTest, UnsatisfiedWith) {
+  EXPECT_CALL(foo_, Bar2(_, _)).With(Ge());
+}
+
 TEST_F(GMockOutputTest, UnsatisfiedExpectation) {
   EXPECT_CALL(foo_, Bar(_, _, _));
   EXPECT_CALL(foo_, Bar2(0, _))
       .Times(2);
 
   foo_.Bar2(0, 1);
 }
 
 TEST_F(GMockOutputTest, MismatchArguments) {
   const std::string s = "Hi";
@@ skipping 98 matching lines @@
   testing::InitGoogleMock(&argc, argv);
 
   // Ensures that the tests pass no matter what value of
   // --gmock_catch_leaked_mocks and --gmock_verbose the user specifies.
   testing::GMOCK_FLAG(catch_leaked_mocks) = true;
   testing::GMOCK_FLAG(verbose) = "warning";
 
   TestCatchesLeakedMocksInAdHocTests();
   return RUN_ALL_TESTS();
 }