summaryrefslogtreecommitdiffstats
path: root/base/ios
diff options
context:
space:
mode:
authorjustincohen <justincohen@chromium.org>2015-06-10 10:38:16 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-10 17:38:49 +0000
commit5a862993ea3a0c7593ac58971015f8122bda7a56 (patch)
treeeb637250741ee5515e1ed3aeb6a0ead6494fb14a /base/ios
parent39825ed5795d26cc69167c1fe774f23117cc8f77 (diff)
downloadchromium_src-5a862993ea3a0c7593ac58971015f8122bda7a56.zip
chromium_src-5a862993ea3a0c7593ac58971015f8122bda7a56.tar.gz
chromium_src-5a862993ea3a0c7593ac58971015f8122bda7a56.tar.bz2
Correct iOS build for latest Xcode beta.
- NSObject's NS_DESIGNATED_INITIALIZER -init method requires an -init NS_UNAVAILABLE implementation. - Correct nonnull API usage. - Cast to NSInteger for comparisons with NSNotFound. - Account for dylib -> tbd change in latest Xcode. BUG=498581, 498825, 498841 Review URL: https://codereview.chromium.org/1171203004 Cr-Commit-Position: refs/heads/master@{#333756}
Diffstat (limited to 'base/ios')
-rw-r--r--base/ios/crb_protocol_observers_unittest.mm9
1 files changed, 7 insertions, 2 deletions
diff --git a/base/ios/crb_protocol_observers_unittest.mm b/base/ios/crb_protocol_observers_unittest.mm
index 5f11051..b8cf423 100644
--- a/base/ios/crb_protocol_observers_unittest.mm
+++ b/base/ios/crb_protocol_observers_unittest.mm
@@ -4,6 +4,7 @@
#import "base/ios/crb_protocol_observers.h"
#include "base/ios/weak_nsobject.h"
+#include "base/logging.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/mac/scoped_nsobject.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -36,10 +37,9 @@
@end
@interface TestMutateObserver : TestCompleteObserver
-
- (instancetype)initWithObserver:(CRBProtocolObservers*)observer
NS_DESIGNATED_INITIALIZER;
-
+- (instancetype)init NS_UNAVAILABLE;
@end
namespace {
@@ -266,6 +266,11 @@ TEST_F(CRBProtocolObserversTest, NestedMutateObservers) {
return self;
}
+- (instancetype)init {
+ NOTREACHED();
+ return nil;
+}
+
- (void)mutateByAddingObserver:(id<TestObserver>)observer {
[_observers addObserver:observer];
}