From dcb5840cee0e7143aa06c6f708d7dfb1b4692eb5 Mon Sep 17 00:00:00 2001
From: Richard Belleville <rbellevi@google.com>
Date: Tue, 21 Jul 2020 23:36:13 +0000
Subject: [PATCH] Fix Mac and Windows

---
 .../google_default_credentials.cc             | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/core/lib/security/credentials/google_default/google_default_credentials.cc b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
index 31cfb68c294..9162bad47bc 100644
--- a/src/core/lib/security/credentials/google_default/google_default_credentials.cc
+++ b/src/core/lib/security/credentials/google_default/google_default_credentials.cc
@@ -356,19 +356,13 @@ grpc_channel_credentials* grpc_google_default_credentials_create(
     grpc_channel_credentials* alts_creds =
         grpc_alts_credentials_create(options);
     grpc_alts_credentials_options_destroy(options);
-    if (alts_creds == nullptr) {
-      gpr_log(GPR_ERROR,
-              "Could not create google default credentials. Are you running on "
-              "GCE?");
-    } else {
-      auto creds =
-          grpc_core::MakeRefCounted<grpc_google_default_channel_credentials>(
-              grpc_core::RefCountedPtr<grpc_channel_credentials>(alts_creds),
-              grpc_core::RefCountedPtr<grpc_channel_credentials>(ssl_creds));
-      result = grpc_composite_channel_credentials_create(
-          creds.get(), call_creds.get(), nullptr);
-      GPR_ASSERT(result != nullptr);
-    }
+    auto creds =
+        grpc_core::MakeRefCounted<grpc_google_default_channel_credentials>(
+            grpc_core::RefCountedPtr<grpc_channel_credentials>(alts_creds),
+            grpc_core::RefCountedPtr<grpc_channel_credentials>(ssl_creds));
+    result = grpc_composite_channel_credentials_create(
+        creds.get(), call_creds.get(), nullptr);
+    GPR_ASSERT(result != nullptr);
   } else {
     gpr_log(GPR_ERROR, "Could not create google default credentials: %s",
             grpc_error_string(error));