Merge commit 'b6cf252a73424f9731806e0fa13ad41265375e96' into bs-databaseinterop

* commit 'b6cf252a73424f9731806e0fa13ad41265375e96':
  Implement necessary protocols

    Added FIRComponentRegistrant and FIRDatabaseNilProtocol to FIRDatabase

Author: bstpierr

Firebase/Database/Api/FIRDatabase.m

@@ -20,6 +20,7 @@
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRComponent.h>
 #import <FirebaseCore/FIRComponentContainer.h>
+#import <FirebaseCore/FIRComponentRegistrant.h>
 #import <FirebaseCore/FIRDependency.h>
 #import <FirebaseCore/FIRLogger.h>
 #import <FirebaseCore/FIROptions.h>
@@ -33,17 +34,16 @@
 #import "FRepoManager.h"
 #import "FValidation.h"
 
-@interface FIRDatabase ()
+// Empty protocol for use with Interop registration.
+@protocol FIRDatabaseNilProtocol
+@end
+
+@interface FIRDatabase () <FIRComponentRegistrant, FIRDatabaseNilProtocol>
 @property (nonatomic, strong) FRepoInfo *repoInfo;
 @property (nonatomic, strong) FIRDatabaseConfig *config;
 @property (nonatomic, strong) FRepo *repo;
 @end
 
-
-// Empty protocol for use with Interop registration.
-@protocol FIRDatabaseNilProtocol
-@end
-
 @implementation FIRDatabase
 
 /** A NSMutableDictionary of FirebaseApp name and FRepoInfo to FirebaseDatabase instance. */