mac: Remove some 10.6-SDK-only sandbox code.

sandbox/mac/os_compatibility.cc

Index: sandbox/mac/os_compatibility.cc
diff --git a/sandbox/mac/os_compatibility.cc b/sandbox/mac/os_compatibility.cc
index 5ddf6a5d03ec9c973e98ffb754e64b089daf1252..ec30732216a63a78c9c7b9e3635703ff0ab1ea0a 100644
--- a/sandbox/mac/os_compatibility.cc
+++ b/sandbox/mac/os_compatibility.cc
@@ -17,16 +17,7 @@ namespace sandbox {
 namespace {
 
 #pragma pack(push, 4)
-// Verified from launchd-329.3.3 (10.6.8).

[Robert Sesek, 2016/04/01 20:00:55]

Can you keep this comment and the one on line 48 (merged).

[Nico, 2016/04/01 20:05:04]

Done.

-struct look_up2_request_10_6 {
-  mach_msg_header_t Head;
-  NDR_record_t NDR;
-  name_t servicename;
-  pid_t targetpid;
-  uint64_t flags;
-};
-
-struct look_up2_reply_10_6 {
+struct look_up2_reply_10_7 {
   mach_msg_header_t Head;
   mach_msg_body_t msgh_body;
   mach_msg_port_descriptor_t service_port;
@@ -45,15 +36,13 @@ struct look_up2_request_10_7 {
   uint64_t flags;
 };
 
-// look_up2_reply_10_7 is the same as the 10_6 version.
-
 // Verified from:
 //   launchd-329.3.3 (10.6.8)
 //   launchd-392.39 (10.7.5)
 //   launchd-442.26.2 (10.8.5)
 //   launchd-842.1.4 (10.9.0)
 typedef int vproc_gsk_t;  // Defined as an enum in liblaunch/vproc_priv.h.
-struct swap_integer_request_10_6 {
+struct swap_integer_request_10_7 {
   mach_msg_header_t Head;
   NDR_record_t NDR;
   vproc_gsk_t inkey;
@@ -72,10 +61,10 @@ size_t strnlen(const char* str, size_t maxlen) {
   return len;
 }
 
-class OSCompatibility_10_6 : public OSCompatibility {
+class OSCompatibility_10_7 : public OSCompatibility {
  public:
-  OSCompatibility_10_6() {}
-  ~OSCompatibility_10_6() override {}
+  OSCompatibility_10_7() {}
+  ~OSCompatibility_10_7() override {}
 
   uint64_t GetMessageSubsystem(const IPCMessage message) override {
     return (message.mach->msgh_id / 100) * 100;
@@ -98,12 +87,12 @@ class OSCompatibility_10_6 : public OSCompatibility {
   }
 
   std::string GetServiceLookupName(const IPCMessage message) override {
-    return GetRequestName<look_up2_request_10_6>(message);
+    return GetRequestName<look_up2_request_10_7>(message);
   }
 
   void WriteServiceLookUpReply(IPCMessage message,
                                mach_port_t service_port) override {
-    auto reply = reinterpret_cast<look_up2_reply_10_6*>(message.mach);
+    auto reply = reinterpret_cast<look_up2_reply_10_7*>(message.mach);
     reply->Head.msgh_size = sizeof(*reply);
     reply->Head.msgh_bits =
         MACH_MSGH_BITS_REMOTE(MACH_MSG_TYPE_MOVE_SEND_ONCE) |
@@ -116,7 +105,7 @@ class OSCompatibility_10_6 : public OSCompatibility {
 
   bool IsSwapIntegerReadOnly(const IPCMessage message) override {
     auto request =
-        reinterpret_cast<const swap_integer_request_10_6*>(message.mach);
+        reinterpret_cast<const swap_integer_request_10_7*>(message.mach);
     return request->inkey == 0 && request->inval == 0 && request->outkey != 0;
   }
 
@@ -136,16 +125,6 @@ class OSCompatibility_10_6 : public OSCompatibility {
   }
 };
 
-class OSCompatibility_10_7 : public OSCompatibility_10_6 {
- public:
-  OSCompatibility_10_7() {}
-  ~OSCompatibility_10_7() override {}
-
-  std::string GetServiceLookupName(const IPCMessage message) override {
-    return GetRequestName<look_up2_request_10_7>(message);
-  }
-};
-
 class OSCompatibility_10_10 : public OSCompatibility {
  public:
   OSCompatibility_10_10() {}
@@ -198,9 +177,7 @@ class OSCompatibility_10_10 : public OSCompatibility {
 
 // static
 scoped_ptr<OSCompatibility> OSCompatibility::CreateForPlatform() {
-  if (base::mac::IsOSSnowLeopard())
-    return make_scoped_ptr(new OSCompatibility_10_6());
-  else if (base::mac::IsOSLionOrLater() && base::mac::IsOSMavericksOrEarlier())
+  if (base::mac::IsOSLionOrLater() && base::mac::IsOSMavericksOrEarlier())
     return make_scoped_ptr(new OSCompatibility_10_7());
   else
     return make_scoped_ptr(new OSCompatibility_10_10());