Update base/ for 10.15 SDK requirement

BUG=1023913

Change-Id: I218a549768b8c9929d8857be6356ed09fcfecfaa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2032078
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742667}

base/mac/foundation_util.h

@@ -43,17 +43,9 @@ typedef enum NSSearchPathDirectory : unsigned int NSSearchPathDirectory;
 typedef unsigned int NSSearchPathDomainMask;
 #endif
 
-#if defined(OS_IOS) ||                  \
-    (defined(MAC_OS_X_VERSION_10_15) && \
-     MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_15)
 typedef struct CF_BRIDGED_TYPE(id) __SecCertificate* SecCertificateRef;
 typedef struct CF_BRIDGED_TYPE(id) __SecKey* SecKeyRef;
 typedef struct CF_BRIDGED_TYPE(id) __SecPolicy* SecPolicyRef;
-#else
-typedef struct OpaqueSecCertificateRef* SecCertificateRef;
-typedef struct OpaqueSecKeyRef* SecKeyRef;
-typedef struct OpaqueSecPolicyRef* SecPolicyRef;
-#endif
 
 namespace base {
 

base/mac/mac_util.h

@@ -149,17 +149,16 @@ BASE_EXPORT int MacOSXMinorVersion();
 //   Chromium, remove the #ifdef that switches between TEST_DEPLOYMENT_TARGET
 //   and IGNORE_DEPLOYMENT_TARGET.
 
+// Versions of macOS supported at runtime but whose SDK is not supported for
+// building.
 DEFINE_IS_OS_FUNCS_CR_MIN_REQUIRED(10, TEST_DEPLOYMENT_TARGET)
 DEFINE_IS_OS_FUNCS(11, TEST_DEPLOYMENT_TARGET)
 DEFINE_IS_OS_FUNCS(12, TEST_DEPLOYMENT_TARGET)
 DEFINE_IS_OS_FUNCS(13, TEST_DEPLOYMENT_TARGET)
-
-#ifdef MAC_OS_X_VERSION_10_14
 DEFINE_IS_OS_FUNCS(14, TEST_DEPLOYMENT_TARGET)
-#else
-DEFINE_IS_OS_FUNCS(14, IGNORE_DEPLOYMENT_TARGET)
-#endif
 
+// Versions of macOS supported at runtime and whose SDK is supported for
+// building.
 #ifdef MAC_OS_X_VERSION_10_15
 DEFINE_IS_OS_FUNCS(15, TEST_DEPLOYMENT_TARGET)
 #else

base/mac/sdk_forward_declarations.h

@@ -75,16 +75,7 @@ BASE_EXPORT extern "C" NSString* const kCWSSIDDidChangeNotification;
 //
 // ----------------------------------------------------------------------------
 
-#if !defined(MAC_OS_X_VERSION_10_15) || \
-    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_15
-
-@interface NSScreen (ForwardDeclare)
-@property(readonly)
-    CGFloat maximumPotentialExtendedDynamicRangeColorComponentValue
-        API_AVAILABLE(macos(10.15));
-@end
-
-#endif  // MAC_OS_X_VERSION_10_15
-
+// Chromium currently is building with the most recent SDK. WWDC is not far
+// away, though....
 
 #endif  // BASE_MAC_SDK_FORWARD_DECLARATIONS_H_