Reland of move all reference to carbon api

webrtc/base/unixfilesystem.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/unixfilesystem.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-#include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
 #include <IOKit/IOCFBundle.h>
 #include <sys/statvfs.h>
 #include "webrtc/base/macutils.h"
 #endif  // WEBRTC_MAC && !defined(WEBRTC_IOS)
 
 #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
 #include <sys/types.h>
 #if defined(WEBRTC_ANDROID)
 #include <sys/statfs.h>
 #elif !defined(__native_client__)
@@ skipping 12 matching lines @@
 #if defined(__native_client__) && !defined(__GLIBC__)
 #include <sys/syslimits.h>
 #endif
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/base/stringutils.h"
 
-#if defined(WEBRTC_IOS)
-// Defined in iosfilesystem.mm.  No header file to discourage use
+#if defined(WEBRTC_MAC)
+// Defined in applefilesystem.mm.  No header file to discourage use
 // elsewhere; other places should use GetApp{Data,Temp}Folder() in
 // this file.  Don't copy/paste.  I mean it.
-char* IOSDataDirectory();
-char* IOSTempDirectory();
-void IOSAppName(rtc::Pathname* path);
+char* AppleDataDirectory();
+char* AppleTempDirectory();
+void AppleAppName(rtc::Pathname* path);
 #endif
 
 namespace rtc {
 
 #if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_IOS)
 char* UnixFilesystem::app_temp_path_ = NULL;
 #else
 char* UnixFilesystem::provided_app_data_folder_ = NULL;
 char* UnixFilesystem::provided_app_temp_folder_ = NULL;
 
 void UnixFilesystem::SetAppDataFolder(const std::string& folder) {
   delete [] provided_app_data_folder_;
   provided_app_data_folder_ = CopyString(folder);
 }
 
 void UnixFilesystem::SetAppTempFolder(const std::string& folder) {
   delete [] provided_app_temp_folder_;
   provided_app_temp_folder_ = CopyString(folder);
 }
 #endif
 
 UnixFilesystem::UnixFilesystem() {
 #if defined(WEBRTC_IOS)
   if (!provided_app_data_folder_)
-    provided_app_data_folder_ = IOSDataDirectory();
+    provided_app_data_folder_ = AppleDataDirectory();
   if (!provided_app_temp_folder_)
-    provided_app_temp_folder_ = IOSTempDirectory();
+    provided_app_temp_folder_ = AppleTempDirectory();
 #endif
 }
 
 UnixFilesystem::~UnixFilesystem() {}
 
 bool UnixFilesystem::CreateFolder(const Pathname &path, mode_t mode) {
   std::string pathname(path.pathname());
   int len = pathname.length();
   if ((len == 0) || (pathname[len - 1] != '/'))
     return false;
@@ skipping 67 matching lines @@
   if (!IsFolder(folder)) {
     ASSERT(IsFolder(folder));
     return false;
   }
   std::string no_slash(folder.pathname(), 0, folder.pathname().length()-1);
   return ::rmdir(no_slash.c_str()) == 0;
 }
 
 bool UnixFilesystem::GetTemporaryFolder(Pathname &pathname, bool create,
                                         const std::string *append) {
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-  FSRef fr;
-  if (0 != FSFindFolder(kOnAppropriateDisk, kTemporaryFolderType,
-                        kCreateFolder, &fr))
-    return false;
-  unsigned char buffer[NAME_MAX+1];
-  if (0 != FSRefMakePath(&fr, buffer, arraysize(buffer)))
-    return false;
-  pathname.SetPathname(reinterpret_cast<char*>(buffer), "");
-#elif defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
+#if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
   ASSERT(provided_app_temp_folder_ != NULL);
   pathname.SetPathname(provided_app_temp_folder_, "");
-#else  // !WEBRTC_MAC || WEBRTC_IOS && !WEBRTC_ANDROID
+#else
   if (const char* tmpdir = getenv("TMPDIR")) {
     pathname.SetPathname(tmpdir, "");
   } else if (const char* tmp = getenv("TMP")) {
     pathname.SetPathname(tmp, "");
   } else {
 #ifdef P_tmpdir
     pathname.SetPathname(P_tmpdir, "");
 #else  // !P_tmpdir
     pathname.SetPathname("/tmp/", "");
 #endif  // !P_tmpdir
   }
-#endif  // !WEBRTC_MAC || WEBRTC_IOS && !WEBRTC_ANDROID
+#endif  // defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
   if (append) {
     ASSERT(!append->empty());
     pathname.AppendFolder(*append);
   }
   return !create || CreateFolder(pathname);
 }
 
 std::string UnixFilesystem::TempFilename(const Pathname &dir,
                                          const std::string &prefix) {
   int len = dir.pathname().size() + prefix.size() + 2 + 6;
@@ skipping 141 matching lines @@
   case FTT_ACCESSED:
     *time = st.st_atime;
     break;
   default:
     return false;
   }
   return true;
 }
 
 bool UnixFilesystem::GetAppPathname(Pathname* path) {
-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
-  ProcessSerialNumber psn = { 0, kCurrentProcess };
-  CFDictionaryRef procinfo = ProcessInformationCopyDictionary(&psn,
-      kProcessDictionaryIncludeAllInformationMask);
-  if (NULL == procinfo)
-    return false;
-  CFStringRef cfpath = (CFStringRef) CFDictionaryGetValue(procinfo,
-      kIOBundleExecutableKey);
-  std::string path8;
-  bool success = ToUtf8(cfpath, &path8);
-  CFRelease(procinfo);
-  if (success)
-    path->SetPathname(path8);
-  return success;
-#elif defined(__native_client__)
+#if defined(__native_client__)
   return false;
-#elif WEBRTC_IOS
-  IOSAppName(path);
+#elif defined(WEBRTC_MAC)
+  AppleAppName(path);
   return true;
 #else  // WEBRTC_MAC && !defined(WEBRTC_IOS)
   char buffer[PATH_MAX + 2];
   ssize_t len = readlink("/proc/self/exe", buffer, arraysize(buffer) - 1);
   if ((len <= 0) || (len == PATH_MAX + 1))
     return false;
   buffer[len] = '\0';
   path->SetPathname(buffer);
   return true;
 #endif  // WEBRTC_MAC && !defined(WEBRTC_IOS)
@@ skipping 177 matching lines @@
 
 }  // namespace rtc
 
 #if defined(__native_client__)
 extern "C" int __attribute__((weak))
 link(const char* oldpath, const char* newpath) {
   errno = EACCES;
   return -1;
 }
 #endif