Update OCMock to 3.1.5

third_party/ocmock/OCMock/OCMObserverRecorder.m

Index: third_party/ocmock/OCMock/OCMObserverRecorder.m
diff --git a/third_party/ocmock/OCMock/OCMObserverRecorder.m b/third_party/ocmock/OCMock/OCMObserverRecorder.m
index e50be50c2ab2d8d4ae98747c55045c6d8d381276..ce28c0a6a23d4ef6c3d06941c762b34359ad48f5 100644
--- a/third_party/ocmock/OCMock/OCMObserverRecorder.m
+++ b/third_party/ocmock/OCMock/OCMObserverRecorder.m
@@ -1,7 +1,18 @@
-//---------------------------------------------------------------------------------------
-//  $Id$
-//  Copyright (c) 2009 by Mulle Kybernetik. See License file for details.
-//---------------------------------------------------------------------------------------
+/*
+ *  Copyright (c) 2009-2015 Erik Doernenburg and contributors
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may
+ *  not use these files except in compliance with the License. You may obtain
+ *  a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ *  License for the specific language governing permissions and limitations
+ *  under the License.
+ */
 
 #import <objc/runtime.h>
 #import <OCMock/OCMConstraint.h>
@@ -52,23 +63,24 @@
 {
 	if([expectedArg isKindOfClass:[OCMConstraint class]])
 	{	
-		if([expectedArg evaluate:observedArg] == NO)
-			return NO;
+		return [expectedArg evaluate:observedArg];
 	}
 	else if([expectedArg conformsToProtocol:objc_getProtocol("HCMatcher")])
 	{
-		if([expectedArg matches:observedArg] == NO)
-			return NO;
+		return [expectedArg matches:observedArg];
+	}
+	else if (expectedArg == observedArg)
+	{
+		return YES;
+	}
+	else if (expectedArg == nil || observedArg == nil)
+	{
+		return NO;
 	}
 	else
 	{
-		if([expectedArg class] != [observedArg class])
-			return NO;
-		if(([expectedArg isEqual:observedArg] == NO) &&
-		   !((expectedArg == nil) && (observedArg == nil)))
-			return NO;
+		return [expectedArg isEqual:observedArg];
 	}
-	return YES;
 }