address changes

firebase · Feb 6, 2018 · 9b222e2 · 9b222e2
1 parent 8bc8550
commit 9b222e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.h b/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.h
@@ -71,12 +71,12 @@ class FirebaseCredentialsProvider : public CredentialsProvider {
   friend class DISABLED_FirebaseCredentialsProviderTest_GetToken_Test;
   friend class DISABLED_FirebaseCredentialsProviderTest_SetListener_Test;
 
- private:
-  /** Initialize with default app for internal usage such as test. */
-  FirebaseCredentialsProvider();
-
-  static void PlatformDependentTestSetup(const absl::string_view config_path);
+  friend class FirebaseCredentialsProviderTest_GetToken_Test;
+  friend class FirebaseCredentialsProviderTest_SetListener_Test;
+  friend class DISABLED_FirebaseCredentialsProviderTest_GetToken_Test;
+  friend class DISABLED_FirebaseCredentialsProviderTest_SetListener_Test;
 
+ private:
   const FIRApp* app_;
 
   /**

diff --git a/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.mm b/Firestore/core/src/firebase/firestore/auth/firebase_credentials_provider_apple.mm
@@ -29,10 +29,6 @@
 
 std::mutex FirebaseCredentialsProvider::mutex_;
 
-FirebaseCredentialsProvider::FirebaseCredentialsProvider()
-    : FirebaseCredentialsProvider([FIRApp defaultApp]) {
-}
-
 FirebaseCredentialsProvider::FirebaseCredentialsProvider(FIRApp* app)
     : app_(app),
       auth_listener_handle_(nil),

diff --git a/Firestore/core/test/firebase/firestore/auth/firebase_credentials_provider_test.mm b/Firestore/core/test/firebase/firestore/auth/firebase_credentials_provider_test.mm
@@ -63,7 +63,7 @@ void SetUp() override {
     return;
   }
 
-  FirebaseCredentialsProvider credentials_provider;
+  FirebaseCredentialsProvider credentials_provider([FIRApp defaultApp]);
   credentials_provider.GetToken(
       true, [](const Token& token, const absl::string_view error) {
         EXPECT_EQ("", token.token());
@@ -80,7 +80,7 @@ void SetUp() override {
     return;
   }
 
-  FirebaseCredentialsProvider credentials_provider;
+  FirebaseCredentialsProvider credentials_provider([FIRApp defaultApp]);
   credentials_provider.SetUserChangeListener([](const User& user) {
     EXPECT_EQ("I'm a fake uid.", user.uid());
     EXPECT_TRUE(user.is_authenticated());