Update OCMock to 3.1.5

third_party/ocmock/README.chromium

Index: third_party/ocmock/README.chromium
diff --git a/third_party/ocmock/README.chromium b/third_party/ocmock/README.chromium
index a31f4a79af231cd072602d6350eb5f1153fbb36e..4b60900071a8dcde843aad7c3a7bb8cb89d6c114 100644
--- a/third_party/ocmock/README.chromium
+++ b/third_party/ocmock/README.chromium
@@ -1,8 +1,8 @@
 Name: ocmock
 URL: https://github.com/erikdoe/ocmock
-Version: unknown
-Revision: 8b8793cf29a5bac0541421ea06c7dff071afb25e
-License: BSD with advertising clause
+Version: 3.1.5
+Revision: f03b3cc126edc8d6a2d4466d227fb41a1b2c2a14
+License: Apache Version 2.0
 License File: NOT_SHIPPED
 Security Critical: no
 
@@ -17,22 +17,15 @@ This is only a partial inclusion of the OCMock tree. This only includes
 The License.txt and Changes.txt file are also present from /Source.
 
 Chromium can no longer sync to the tip-of-tree because upstream OCMock requires
-10.7 as of b5773084d56d2573caf6a2d98d5b56e301673de1.
+OS X 10.11.
 
 Chromium adds gtest_support.h/.mm and ocmock_extensions.h/.mm.
 
-Chromium alters all NSLogging of -[NSArray count] to compile under both 32 and
-64 bits.
+Chromium patches in 3e193f3c2d4ea4ada63df54c8ce98e7ea4cf768f to use OCMock with
+libc++'s string for return types having vtables.
 
-Chromium also patches in e8a9cc97936bfa8be97706c5092110603745e708 for fixing
-unit tests broken with Xcode 5 due to the lack of copyWithZone: selector.
-
-Chromium also patches in 77400c22b5bafd8aaaa75f90a1d997838204577a that fixes
-the comparison of types between invocation return type description (which
-changed from "c" to "B" on arm64) and NSValue objCType (which didn't change)
-on arm64 for BOOL values.
-
-Chromium also patches in 65ee89744bc1fbb9461f26d83e08243068cb212b that fixes
-the comparison between opaque (forward-declared) and non-opaque types.
-
-Chromium adds the patch suggested in https://github.com/erikdoe/ocmock/issues/247
+Chromium patches in c32abcaba428921d8ac12ac98b272ecf8241f9bb and
+33aeea46b0912d9f57ff0ee2763f2667ac099acc to allow the use of .andReturn(...)
+because our version of clang does not support __builtin_types_compatible_p.
+As we are building with Objective-C++, we need to add 'extern "C"' in
+OCMFunctions.h to have C linkage.