Switch users of foundation_util.h to include it directly and clean up uses of mac_util.h.

chrome/browser/mac/dock.mm

 // Copyright (c) 2012 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.
 
 #import "chrome/browser/mac/dock.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 #import <Foundation/Foundation.h>
 #include <CoreFoundation/CoreFoundation.h>
 #include <signal.h>
 
 #include "base/logging.h"
+#include "base/mac/foundation_util.h"
 #include "base/mac/launchd.h"
 #include "base/mac/mac_logging.h"
-#include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/strings/sys_string_conversions.h"
 
 extern "C" {
 
 // Undocumented private internal CFURL functions. The Dock uses these to
 // serialize and deserialize CFURLs for use in its plist's file-data keys. See
 // 10.5.8 CF-476.19 and 10.7.2 CF-635.15's CFPriv.h and CFURL.c. The property
 // list representation will contain, at the very least, the _CFURLStringType
@@ skipping 304 matching lines @@
 
   // Rewrite the plist.
   [dock_plist setObject:persistent_apps forKey:kDockPersistentAppsKey];
   [user_defaults setPersistentDomain:dock_plist forName:kDockDomain];
 
   Restart();
   return IconAddSuccess;
 }
 
 }  // namespace dock