3 files changed, 6 insertions, 8 deletions
diff --git a/Example/Messaging/Tests/FIRMessagingClientTest.m b/Example/Messaging/Tests/FIRMessagingClientTest.m
index 9c60d9c..738df05 100644
--- a/Example/Messaging/Tests/FIRMessagingClientTest.m
+++ b/Example/Messaging/Tests/FIRMessagingClientTest.m
@@ -31,7 +31,7 @@
 #import "FIRMessagingUtilities.h"
 #import "NSError+FIRMessaging.h"
 
-#import <FirebaseCore/FIRReachabilityChecker.h>
+#import <GoogleUtilities/GULReachabilityChecker.h>
 
 static NSString *const kFIRMessagingUserDefaultsSuite = @"FIRMessagingClientTestUserDefaultsSuite";
 
@@ -104,7 +104,7 @@ static NSString *const kTopicToSubscribeTo = @"/topics/abcdef/hello-world";
   [super setUp];
   _mockClientDelegate =
       OCMStrictProtocolMock(@protocol(FIRMessagingClientDelegate));
-  _mockReachability = OCMClassMock([FIRReachabilityChecker class]);
+  _mockReachability = OCMClassMock([GULReachabilityChecker class]);
   _mockRmqManager = OCMClassMock([FIRMessagingRmqManager class]);
   _client = [[FIRMessagingClient alloc] initWithDelegate:_mockClientDelegate
                                    reachability:_mockReachability
@@ -203,7 +203,7 @@ static NSString *const kTopicToSubscribeTo = @"/topics/abcdef/hello-world";
 
   // the network is available
   [[[self.mockReachability stub]
-      andReturnValue:@(kFIRReachabilityViaWifi)] reachabilityStatus];
+      andReturnValue:@(kGULReachabilityViaWifi)] reachabilityStatus];
 
   [self setupFakeConnectionWithClass:[FIRMessagingFakeFailConnection class]
           withSetupCompletionHandler:^(FIRMessagingConnection *connection) {
@@ -241,7 +241,7 @@ static NSString *const kTopicToSubscribeTo = @"/topics/abcdef/hello-world";
 
   // the network is available
   [[[self.mockReachability stub]
-      andReturnValue:@(kFIRReachabilityViaWifi)] reachabilityStatus];
+      andReturnValue:@(kGULReachabilityViaWifi)] reachabilityStatus];
 
   XCTestExpectation *setupConnection =
       [self expectationWithDescription:@"Fcm should successfully setup a connection"];
diff --git a/Example/Messaging/Tests/FIRMessagingConnectionTest.m b/Example/Messaging/Tests/FIRMessagingConnectionTest.m
index b770cf5..71da301 100644
--- a/Example/Messaging/Tests/FIRMessagingConnectionTest.m
+++ b/Example/Messaging/Tests/FIRMessagingConnectionTest.m
@@ -19,7 +19,6 @@
 #import <OCMock/OCMock.h>
 
 #import "Protos/GtalkCore.pbobjc.h"
-#import <GoogleToolboxForMac/GTMDefines.h>
 
 #import "FIRMessagingClient.h"
 #import "FIRMessagingConnection.h"
@@ -374,7 +373,7 @@ static FIRMessagingProtoTag currentProtoSendTag;
 }
 
 - (void)_sendData:(NSData *)data withTag:(int8_t)tag rmqId:(NSString *)rmqId {
-  _GTMDevLog(@"FIRMessaging Socket: Send data with Tag: %d rmq: %@", tag, rmqId);
+  NSLog(@"FIRMessaging Socket: Send data with Tag: %d rmq: %@", tag, rmqId);
   if (currentProtoSendTag > 0) {
     XCTAssertEqual(tag, currentProtoSendTag);
   }
diff --git a/Example/Messaging/Tests/FIRMessagingFakeSocket.m b/Example/Messaging/Tests/FIRMessagingFakeSocket.m
index cffe69a..c347d31 100644
--- a/Example/Messaging/Tests/FIRMessagingFakeSocket.m
+++ b/Example/Messaging/Tests/FIRMessagingFakeSocket.m
@@ -18,7 +18,6 @@
 
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingDefines.h"
-#import <GoogleToolboxForMac/GTMDefines.h>
 
 @interface FIRMessagingSecureSocket() <NSStreamDelegate>
 
@@ -78,7 +77,7 @@
 }
 
 - (void)openStream:(NSStream *)stream {
-  _GTMDevAssert(stream, @"Cannot open nil stream");
+  NSAssert(stream, @"Cannot open nil stream");
   if (stream) {
     stream.delegate = self;
     [stream scheduleInRunLoop:self.runLoop forMode:NSDefaultRunLoopMode];