Revert "[Messaging] Prep #13691 (#13720)

Author: paulb777

FirebaseMessaging/Sources/FIRMessaging.m

@@ -40,10 +40,7 @@
 #import "FirebaseMessaging/Sources/FIRMessagingUtilities.h"
 #import "FirebaseMessaging/Sources/FIRMessaging_Private.h"
 #import "FirebaseMessaging/Sources/NSError+FIRMessaging.h"
-#if __has_include( \
-    "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
 #import "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h"
-#endif  // __has_include("FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
 #import "FirebaseMessaging/Sources/Token/FIRMessagingAuthService.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingTokenInfo.h"
 #import "FirebaseMessaging/Sources/Token/FIRMessagingTokenManager.h"
@@ -134,8 +131,6 @@ + (FIRMessaging *)messaging {
   return (FIRMessaging *)instance;
 }
 
-#if __has_include( \
-    "FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
 + (FIRMessagingExtensionHelper *)extensionHelper {
   static dispatch_once_t once;
   static FIRMessagingExtensionHelper *extensionHelper;
@@ -144,8 +139,6 @@ + (FIRMessagingExtensionHelper *)extensionHelper {
   });
   return extensionHelper;
 }
-#endif  // __has_include("FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessagingExtensionHelper.h")
-
 - (instancetype)initWithAnalytics:(nullable id<FIRAnalyticsInterop>)analytics
                      userDefaults:(GULUserDefaults *)defaults
                   heartbeatLogger:(FIRHeartbeatLogger *)heartbeatLogger {

FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h

@@ -136,9 +136,7 @@ NS_SWIFT_NAME(MessagingMessageInfo)
 @end
 
 @class FIRMessaging;
-#if __has_include("FIRMessagingExtensionHelper.h")
 @class FIRMessagingExtensionHelper;
-#endif  // __has_include("FIRMessagingExtensionHelper.h")
 
 /**
  * A protocol to handle token update or data message delivery from FCM.
@@ -186,7 +184,6 @@ NS_SWIFT_NAME(Messaging)
  */
 + (instancetype)messaging NS_SWIFT_NAME(messaging());
 
-#if __has_include("FIRMessagingExtensionHelper.h")
 /**
  * Use the MessagingExtensionHelper to populate rich UI content for your notifications.
  * For example, if an image URL is set in your notification payload or on the console,
@@ -197,7 +194,6 @@ NS_SWIFT_NAME(Messaging)
  */
 + (FIRMessagingExtensionHelper *)extensionHelper NS_SWIFT_NAME(serviceExtension())
     NS_AVAILABLE(10.14, 10.0);
-#endif  // __has_include("FIRMessagingExtensionHelper.h")
 
 /**
  *  Unavailable. Use +messaging instead.

FirebaseMessaging/Sources/Public/FirebaseMessaging/FirebaseMessaging.h

@@ -15,6 +15,4 @@
  */
 
 #import "FIRMessaging.h"
-#if __has_include("FIRMessagingExtensionHelper.h")
 #import "FIRMessagingExtensionHelper.h"
-#endif  // __has_include("FIRMessagingExtensionHelper.h")