Update various bits of Chromium to require the 10.15 SDK.

BUG=1023913

Change-Id: I8f0364896d0cc5d4480aa293ddf38c61daea617e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036350
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#742692}

components/viz/common/gpu/metal_api_proxy.mm

@@ -549,7 +549,7 @@ PROXY_METHOD1_SLOW(nullable id<MTLArgumentEncoder>,
                    newArgumentEncoderWithArguments,
                    NSArray<MTLArgumentDescriptor*>*)
 
-#if defined(MAC_OS_X_VERSION_10_14)
+// macOS 10.14
 PROXY_METHOD1_SLOW(nullable id<MTLTexture>,
                    newSharedTextureWithDescriptor,
                    MTLTextureDescriptor*)
@@ -573,9 +573,8 @@ PROXY_METHOD0(nullable id<MTLSharedEvent>, newSharedEvent)
 PROXY_METHOD1(nullable id<MTLSharedEvent>,
               newSharedEventWithHandle,
               MTLSharedEventHandle*)
-#endif  // MAC_OS_X_VERSION_10_14
 
-#if defined(MAC_OS_X_VERSION_10_15)
+// macOS 10.15
 PROXY_METHOD0(BOOL, hasUnifiedMemory)
 PROXY_METHOD0(MTLDeviceLocation, location)
 PROXY_METHOD0(NSUInteger, locationNumber)
@@ -593,7 +592,6 @@ PROXY_METHOD2_SLOW(nullable id<MTLCounterSampleBuffer>,
                    error,
                    NSError**)
 PROXY_METHOD2(void, sampleTimestamps, NSUInteger*, gpuTimestamp, NSUInteger*)
-#endif  // MAC_OS_X_VERSION_10_15
 
 #pragma clang diagnostic pop
 @end

ui/gfx/mac/io_surface.cc

@@ -21,13 +21,6 @@ namespace gfx {
 
 namespace {
 
-#if !defined(MAC_OS_X_VERSION_10_15) || \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_15
-CFStringRef kCGColorSpaceITUR_2020_PQ_EOTF =
-    CFSTR("kCGColorSpaceITUR_2020_PQ_EOTF");
-CFStringRef kCGColorSpaceITUR_2020_HLG = CFSTR("kCGColorSpaceITUR_2020_HLG");
-#endif  // MAC_OS_X_VERSION_10_15
-
 void AddIntegerValue(CFMutableDictionaryRef dictionary,
                      const CFStringRef key,
                      int32_t value) {