fix typo in iOS target (#2673)

* also a few minor cleanup

Author: charlotteliang

Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m

@@ -108,7 +108,6 @@ - (void)testSendValidMessage_withNoConnection {
                error:[OCMArg anyObjectRef]];
 
   // should be logged into the service
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
   // try to send messages with no connection should be queued into RMQ
   NSMutableDictionary *message = [self upstreamMessageWithID:messageID ttl:-1 delay:0];
@@ -158,7 +157,6 @@ - (void)testSendInvalidMessage_withNoTo {
                           }]]);
 
   // should be logged into the service
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
   [self.dataMessageManager sendDataMessageStanza:message];
 
@@ -187,7 +185,6 @@ - (void)testSendInvalidMessage_withSizeExceeded {
                             return NO;
                           }]]);
 
-  [self addFakeFIRMessagingRegistrationToken];
   // should be logged into the service
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
   [self.dataMessageManager sendDataMessageStanza:message];
@@ -215,7 +212,6 @@ - (void)testSendValidMessage_withRmqSaveError {
 
   // should be logged into the service
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager sendDataMessageStanza:message];
 
   OCMVerifyAll(self.mockReceiver);
@@ -240,7 +236,6 @@ - (void)testSendValidMessage_withTTL0 {
   OCMExpect([self.mockClient sendMessage:[OCMArg checkWithBlock:isValidStanza]]);
 
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager sendDataMessageStanza:message];
 
   OCMVerifyAll(self.mockClient);
@@ -276,7 +271,6 @@ - (void)XXX_testSendValidMessage_withTTL0AndNoFIRMessagingConnection {
   OCMExpect([self.mockClient retryConnectionImmediately:[OCMArg isEqual:@YES]]);
 
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager sendDataMessageStanza:message];
 
   OCMVerifyAll(self.mockClient);
@@ -302,7 +296,6 @@ - (void)xxx_testSendValidMessage_withTTL0AndNoNetwork {
   }]]);
 
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager sendDataMessageStanza:message];
 
   OCMVerifyAll(self.mockReceiver);
@@ -329,7 +322,6 @@ - (void)XXX_testDelayedMessagesBeingResentOnReconnect {
                                                    error:[OCMArg isNil]]);
 
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager sendDataMessageStanza:message];
 
   __block FIRMessagingDataMessageHandler dataMessageHandler;
@@ -496,7 +488,6 @@ - (void)testResendSavedMessages {
   // have a real RMQ store
   [self.dataMessageManager setRmq2Manager:newRmqManager];
 
-  [self addFakeFIRMessagingRegistrationToken];
   [self.dataMessageManager setDeviceAuthID:@"auth-id" secretToken:@"secret-token"];
 
   // send a couple of message with no connection should be saved to RMQ
@@ -576,12 +567,6 @@ - (void)testResendingExpiredMessagesFails {
                         dataMessageHandler:nil];
 }
 
-#pragma mark - Private
-
-- (void)addFakeFIRMessagingRegistrationToken {
-  // [[FIRMessagingDefaultsManager sharedInstance] saveAppIDToken:kFIRMessagingAppIDToken];
-}
-
 #pragma mark - Create Packet
 
 - (GtalkDataMessageStanza *)validDataMessagePacket {

Firebase/Messaging/FIRMessagingCheckinService.h

@@ -18,7 +18,7 @@
 
 /**
  * Register the device with Checkin Service and get back the `authID`, `secret token` etc. for the
- * client. Checkin results are cached in the `FIRMessagingDefaultsManager` and periodically refreshed to
+ * client. Checkin results are cached and periodically refreshed to
  * prevent them from being stale. Each client needs to register with checkin before registering
  * with FIRMessaging.
  */

Firebase/Messaging/FIRMessagingRmq2PersistentStore.m

@@ -126,7 +126,7 @@ - (instancetype)initWithDatabaseName:(NSString *)databaseName {
   self = [super init];
   if (self) {
     _databaseName = [databaseName copy];
-#if TARGET_OS_iOS
+#if TARGET_OS_IOS
     BOOL didMoveToApplicationSupport =
         [self moveToApplicationSupportSubDirectory:kFIRMessagingSubDirectoryName];