summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthakis <thakis@chromium.org>2015-10-09 13:34:14 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-09 20:34:59 +0000
commitc317595ba190ac0177927ef9cd38f3c7ac867216 (patch)
tree72b2969fac70e7b3b58a5c88e21c67a181ec46da
parent5014371a5caf42235246e54622fa6dec0edd5ba1 (diff)
downloadchromium_src-c317595ba190ac0177927ef9cd38f3c7ac867216.zip
chromium_src-c317595ba190ac0177927ef9cd38f3c7ac867216.tar.gz
chromium_src-c317595ba190ac0177927ef9cd38f3c7ac867216.tar.bz2
mac: Make base_unittests build with the 10.11 SDK.
BUG=517914 Review URL: https://codereview.chromium.org/1400863002 Cr-Commit-Position: refs/heads/master@{#353374}
-rw-r--r--base/mac/call_with_eh_frame_unittest.mm4
-rw-r--r--base/mac/scoped_sending_event_unittest.mm2
2 files changed, 4 insertions, 2 deletions
diff --git a/base/mac/call_with_eh_frame_unittest.mm b/base/mac/call_with_eh_frame_unittest.mm
index 46bf285..4dad822 100644
--- a/base/mac/call_with_eh_frame_unittest.mm
+++ b/base/mac/call_with_eh_frame_unittest.mm
@@ -15,7 +15,9 @@ namespace {
class CallWithEHFrameTest : public testing::Test {
protected:
void ThrowException() {
- [NSArray arrayWithObject:nil];
+ @throw [NSException exceptionWithName:@"TestException"
+ reason:@"Testing exceptions"
+ userInfo:nil];
}
};
diff --git a/base/mac/scoped_sending_event_unittest.mm b/base/mac/scoped_sending_event_unittest.mm
index 02ef2db..52f18c6 100644
--- a/base/mac/scoped_sending_event_unittest.mm
+++ b/base/mac/scoped_sending_event_unittest.mm
@@ -9,7 +9,7 @@
#include "base/mac/scoped_nsobject.h"
#include "testing/gtest/include/gtest/gtest.h"
-@interface ScopedSendingEventTestCrApp : NSObject <CrAppControlProtocol> {
+@interface ScopedSendingEventTestCrApp : NSApplication <CrAppControlProtocol> {
@private
BOOL handlingSendEvent_;
}