Migrate to OS_MAC and OS_APPLE in google_apis

Bug: 1105907
Change-Id: I2fcdfd793c5888e0d2c009961013cab2b5a9f9f2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2324898Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792724}

google_apis/gcm/tools/mcs_probe.cc

@@ -61,7 +61,7 @@
 #include "services/network/public/mojom/url_loader_factory.mojom.h"
 #include "services/network/test/test_network_connection_tracker.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_MAC)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 

google_apis/google_api_keys.cc

@@ -21,7 +21,7 @@
 #include "google_apis/gaia/gaia_config.h"
 #include "google_apis/gaia/gaia_switches.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_APPLE)
 #include "google_apis/google_api_keys_mac.h"
 #endif
 
@@ -264,7 +264,7 @@ class APIKeyCache {
                                        GaiaConfig* gaia_config) {
     std::string key_value = baked_in_value;
     std::string temp;
-#if defined(OS_MACOSX)
+#if defined(OS_APPLE)
     // macOS and iOS can also override the API key with a value from the
     // Info.plist.
     temp = ::google_apis::GetAPIKeyFromInfoPlist(environment_variable_name);

google_apis/google_api_keys_unittest.cc

@@ -28,7 +28,7 @@
 // the Mac and Linux linkers).  Therefore these tests are only built
 // and run on Mac and Linux, which should provide plenty of coverage
 // since there are no platform-specific bits in this code.
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_APPLE)
 
 // We need to include everything included by google_api_keys.cc once
 // at global scope so that things like STL and classes from base don't
@@ -45,7 +45,7 @@
 #include "base/logging.h"
 #include "base/strings/stringize_macros.h"
 
-#if defined(OS_MACOSX)
+#if defined(OS_APPLE)
 #include "google_apis/google_api_keys_mac.h"
 #endif
 
@@ -668,4 +668,4 @@ TEST_F(GoogleAPIKeysTest, OverrideAllKeysUsingConfig) {
             testcase::GetOAuth2ClientSecret(testcase::CLIENT_REMOTING_HOST));
 }
 
-#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
+#endif  // defined(OS_LINUX) || defined(OS_APPLE)