Revert "Drop 10.5 support: use ServiceManagement.framework directly."

util/mac/service_management_test.mm

Index: util/mac/service_management_test.mm
diff --git a/util/mac/service_management_test.mm b/util/mac/service_management_test.mm
index 922c4d8a600fb26c4319dcac1fda1cbe44959d38..3c1d638394dc2fb08b6d8940870aa42596ab4b28 100644
--- a/util/mac/service_management_test.mm
+++ b/util/mac/service_management_test.mm
@@ -27,7 +27,6 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/rand_util.h"
 #include "gtest/gtest.h"
-#include "util/mac/mac_util.h"
 #include "util/posix/process_util.h"
 #include "util/stdlib/objc.h"
 
@@ -56,7 +55,7 @@ void ExpectProcessIsRunning(pid_t pid, std::string& last_arg) {
       if (inner_tries > 0) {
         timespec sleep_time;
         sleep_time.tv_sec = 0;
-        sleep_time.tv_nsec = 1E5;  // 100 microseconds
+        sleep_time.tv_nsec = 1E6;  // 1 millisecond
         nanosleep(&sleep_time, NULL);
       }
     } while (inner_tries--);
@@ -158,16 +157,8 @@ TEST(ServiceManagement, SubmitRemoveJob) {
     EXPECT_EQ(0, ServiceManagementIsJobRunning(kJobLabel));
 
     // Now that the job is unloaded, a subsequent attempt to unload it should be
-    // an error. However, ServiceManagementRemoveJob does not properly report
-    // this error case on Mac OS X 10.10.
-    if (MacOSXMinorVersion() >= 10) {
-      // If this check starts failing because radar 18268941 is fixed, remove
-      // the OS version check here and revise the interface documentation for
-      // ServiceManagementRemoveJob().
-      EXPECT_TRUE(ServiceManagementRemoveJob(kJobLabel, false));
-    } else {
-      EXPECT_FALSE(ServiceManagementRemoveJob(kJobLabel, false));
-    }
+    // an error.
+    EXPECT_FALSE(ServiceManagementRemoveJob(kJobLabel, false));
 
     ExpectProcessIsNotRunning(job_pid, shell_script);
   }