roll gtm 459:516

chrome/common/mac/launchd.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/mac/launchd.h"
 
 #import <Foundation/Foundation.h>
 #include <launch.h>
 
 #include "base/mac/mac_util.h"
@@ skipping 78 matching lines @@
 
 CFDictionaryRef Launchd::CopyExports() {
   return GTMCopyLaunchdExports();
 }
 
 CFDictionaryRef Launchd::CopyJobDictionary(CFStringRef label) {
   return GTMSMJobCopyDictionary(label);
 }
 
 CFDictionaryRef Launchd::CopyDictionaryByCheckingIn(CFErrorRef* error) {
-  return GTMSMJobCheckIn(error);
+  return GTMSMCopyJobCheckInDictionary(error);
 }
 
 bool Launchd::RemoveJob(CFStringRef label, CFErrorRef* error) {
   return GTMSMJobRemove(label, error);
 }
 
 bool Launchd::RestartJob(Domain domain,
                          Type type,
                          CFStringRef name,
                          CFStringRef cf_session_type) {
@@ skipping 50 matching lines @@
   NSError* err = nil;
   if (![[NSFileManager defaultManager] removeItemAtPath:[ns_url path]
                                                   error:&err]) {
     if ([err code] != NSFileNoSuchFileError) {
       DLOG(ERROR) << "DeletePlist: " << base::mac::NSToCFCast(err);
     }
     return false;
   }
   return true;
 }