mac: Use @available instead of -Wunguarded-availability suppression where possible.

This works despite https://llvm.org/PR33796 here because these
functions are in an unnamed namespace.

Bug: 735328
Change-Id: Ia22c05303a0360573aa1a0385c6a3966767f84cd
Reviewed-on: https://chromium-review.googlesource.com/573113Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#487023}

content/common/quarantine/quarantine_mac.mm

@@ -10,6 +10,7 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/mac/availability.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_logging.h"
 #include "base/mac/mac_util.h"
@@ -76,6 +77,7 @@ bool SetQuarantinePropertiesDeprecated(const base::FilePath& file,
 #pragma clang diagnostic pop
 #endif
 
+API_AVAILABLE(macos(10.10))
 bool GetQuarantineProperties(
     const base::FilePath& file,
     base::scoped_nsobject<NSMutableDictionary>* properties) {
@@ -84,15 +86,11 @@ bool GetQuarantineProperties(
   if (!file_url)
     return false;
 
-// NSURLQuarantinePropertiesKey is only available on macOS 10.10+.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
   NSError* error = nil;
   id quarantine_properties = nil;
   BOOL success = [file_url getResourceValue:&quarantine_properties
                                      forKey:NSURLQuarantinePropertiesKey
                                       error:&error];
-#pragma clang diagnostic pop
   if (!success) {
     std::string error_message(error ? error.description.UTF8String : "");
     LOG(WARNING) << "Unable to get quarantine attributes for file "
@@ -116,6 +114,7 @@ bool GetQuarantineProperties(
   return true;
 }
 
+API_AVAILABLE(macos(10.10))
 bool SetQuarantineProperties(const base::FilePath& file,
                              NSDictionary* properties) {
   base::scoped_nsobject<NSURL> file_url([[NSURL alloc]
@@ -123,14 +122,10 @@ bool SetQuarantineProperties(const base::FilePath& file,
   if (!file_url)
     return false;
 
-// NSURLQuarantinePropertiesKey is only available on macOS 10.10+.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
   NSError* error = nil;
   bool success = [file_url setResourceValue:properties
                                      forKey:NSURLQuarantinePropertiesKey
                                       error:&error];
-#pragma clang diagnostic pop
   if (!success) {
     std::string error_message(error ? error.description.UTF8String : "");
     LOG(WARNING) << "Unable to set quarantine attributes on file "
@@ -241,7 +236,7 @@ bool AddQuarantineMetadataToFile(const base::FilePath& file,
   base::ThreadRestrictions::AssertIOAllowed();
   base::scoped_nsobject<NSMutableDictionary> properties;
   bool success = false;
-  if (base::mac::IsAtLeastOS10_10()) {
+  if (@available(macos 10.10, *)) {
     success = GetQuarantineProperties(file, &properties);
   } else {
     success = GetQuarantinePropertiesDeprecated(file, &properties);
@@ -285,7 +280,7 @@ bool AddQuarantineMetadataToFile(const base::FilePath& file,
     [properties setValue:origin_url forKey:(NSString*)kLSQuarantineDataURLKey];
   }
 
-  if (base::mac::IsAtLeastOS10_10()) {
+  if (@available(macos 10.10, *)) {
     return SetQuarantineProperties(file, properties);
   } else {
     return SetQuarantinePropertiesDeprecated(file, properties);
@@ -319,7 +314,7 @@ bool IsFileQuarantined(const base::FilePath& file,
 
   base::scoped_nsobject<NSMutableDictionary> properties;
   bool success = false;
-  if (base::mac::IsAtLeastOS10_10()) {
+  if (@available(macos 10.10, *)) {
     success = GetQuarantineProperties(file, &properties);
   } else {
     success = GetQuarantinePropertiesDeprecated(file, &properties);

content/common/quarantine/quarantine_mac_unittest.mm

@@ -10,6 +10,7 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
+#include "base/mac/availability.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
@@ -29,32 +30,28 @@ class QuarantineMacTest : public testing::Test {
 
  protected:
   void SetUp() override {
-    if (base::mac::IsAtMostOS10_9()) {
+    if (@available(macos 10.10, *)) {
+      ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+      ASSERT_TRUE(
+          base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &test_file_));
+      file_url_.reset([[NSURL alloc]
+          initFileURLWithPath:base::SysUTF8ToNSString(test_file_.value())]);
+
+      base::scoped_nsobject<NSMutableDictionary> properties(
+          [[NSMutableDictionary alloc] init]);
+      [properties setValue:@"com.google.Chrome"
+                    forKey:static_cast<NSString*>(
+                               kLSQuarantineAgentBundleIdentifierKey)];
+      [properties setValue:@"Google Chrome.app"
+                    forKey:static_cast<NSString*>(kLSQuarantineAgentNameKey)];
+      [properties setValue:@(1) forKey:@"kLSQuarantineIsOwnedByCurrentUserKey"];
+      bool success = [file_url_ setResourceValue:properties
+                                          forKey:NSURLQuarantinePropertiesKey
+                                           error:nullptr];
+      ASSERT_TRUE(success);
+    } else {
       LOG(WARNING) << "Test suite requires Mac OS X 10.10 or later";
-      return;
     }
-    ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-    ASSERT_TRUE(
-        base::CreateTemporaryFileInDir(temp_dir_.GetPath(), &test_file_));
-    file_url_.reset([[NSURL alloc]
-        initFileURLWithPath:base::SysUTF8ToNSString(test_file_.value())]);
-
-    base::scoped_nsobject<NSMutableDictionary> properties(
-        [[NSMutableDictionary alloc] init]);
-    [properties
-        setValue:@"com.google.Chrome"
-          forKey:static_cast<NSString*>(kLSQuarantineAgentBundleIdentifierKey)];
-    [properties setValue:@"Google Chrome.app"
-                  forKey:static_cast<NSString*>(kLSQuarantineAgentNameKey)];
-    [properties setValue:@(1) forKey:@"kLSQuarantineIsOwnedByCurrentUserKey"];
-// NSURLQuarantinePropertiesKey is only available on macOS 10.10+.
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunguarded-availability"
-    bool success = [file_url_ setResourceValue:properties
-                                        forKey:NSURLQuarantinePropertiesKey
-                                         error:nullptr];
-#pragma clang diagnostic pop
-    ASSERT_TRUE(success);
   }
 
   base::ScopedTempDir temp_dir_;