Integrate Latest @ 264880670

CL: 264880670

Author: a-maurice

admob/testapp/src/common_main.cc

@@ -84,11 +84,11 @@ const char* kAdMobAppID = "YOUR_IOS_ADMOB_APP_ID";
 #if defined(__ANDROID__)
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/6300978111";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/1033173712";
-const char* kRewardedVideoAdUnit = "ca-app-pub-3940256099942544/2888167318";
+const char* kRewardedVideoAdUnit = "ca-app-pub-3940256099942544/5224354917";
 #else
 const char* kBannerAdUnit = "ca-app-pub-3940256099942544/2934735716";
 const char* kInterstitialAdUnit = "ca-app-pub-3940256099942544/4411468910";
-const char* kRewardedVideoAdUnit = "ca-app-pub-3940256099942544/6386090517";
+const char* kRewardedVideoAdUnit = "ca-app-pub-3940256099942544/1712485313";
 #endif
 
 // Standard mobile banner size is 320x50.

auth/testapp/src/common_main.cc

@@ -18,7 +18,7 @@
 
 #include "firebase/app.h"
 #include "firebase/auth.h"
-#include "firebase/auth/client/cpp/src/include/firebase/auth/credential.h"
+#include "firebase/auth/credential.h"
 #include "firebase/util.h"
 
 // Thin OS abstraction layer.
@@ -1257,7 +1257,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
   }
 
 #ifdef INTERNAL_EXPERIMENTAL
-#if defined TARGET_OS_IPHONE
+#if defined TARGET_OS_IPHONE || defined(__ANDROID__)
   // --- FederatedAuthProvider tests  ------------------------------------------
   {
     {  // --- LinkWithProvider  ---
@@ -1315,7 +1315,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
     }
 
     {  // --- ReauthenticateWithProvider ---
-      LogMessage("ReauthetnicateWithProvider");
+      LogMessage("ReauthethenticateWithProvider");
       if (!auth->current_user()) {
         LogMessage("ERROR: Expected User from SignInWithProvider");
       } else {
@@ -1345,7 +1345,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
                     /*log_error=*/true);
     }
   }     // end FederatedAuthProvider
-#endif  // TARGET_OS_IPHONE
+#endif  // TARGET_OS_IPHONE || defined(__ANDROID__)
 #endif  // INTERNAL_EXPERIMENTAL
 
   LogMessage("Completed Auth tests.");