commit a0c88878b6bfabc4a841d0756701af2ca1b1ad76
author nisse <nisse@webrtc.org> Thu Aug 24 02:20:46 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Aug 24 09:20:46 2017 +0000
tree 5788d4f6e9b91daec2bcd21cf2847a0874229193
parent eaea27799d7140c1b56e76562e34ab6e036b2fb5

Delete Filesystem::GetTemporaryFolder.

Testcode updated to use webrtc::test::TempFilename.
Also deletes now unused functions AppleDataDirectory,
AppleTempDirectory and AppleAppName.

BUG=webrtc:6424

Review-Url: https://codereview.webrtc.org/2995413002
Cr-Commit-Position: refs/heads/master@{#19483}

webrtc/rtc_base/unixfilesystem.cc

diff --git a/webrtc/rtc_base/unixfilesystem.cc b/webrtc/rtc_base/unixfilesystem.cc
index 345c602..ebf20c7 100644
--- a/webrtc/rtc_base/unixfilesystem.cc
+++ b/webrtc/rtc_base/unixfilesystem.cc
@@ -51,42 +51,9 @@
 #include "webrtc/rtc_base/stream.h"
 #include "webrtc/rtc_base/stringutils.h"
 
-#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* AppleDataDirectory();
-char* AppleTempDirectory();
-void AppleAppName(rtc::Pathname* path);
-#endif
-
 namespace rtc {
 
-#if !defined(WEBRTC_ANDROID) && !defined(WEBRTC_MAC)
-char* UnixFilesystem::app_temp_path_ = nullptr;
-#else
-char* UnixFilesystem::provided_app_data_folder_ = nullptr;
-char* UnixFilesystem::provided_app_temp_folder_ = nullptr;
-
-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_MAC)
-  if (!provided_app_data_folder_)
-    provided_app_data_folder_ = AppleDataDirectory();
-  if (!provided_app_temp_folder_)
-    provided_app_temp_folder_ = AppleTempDirectory();
-#endif
-}
+UnixFilesystem::UnixFilesystem() {}
 
 UnixFilesystem::~UnixFilesystem() {}
 
@@ -133,31 +100,6 @@
   return ::unlink(filename.pathname().c_str()) == 0;
 }
 
-bool UnixFilesystem::GetTemporaryFolder(Pathname &pathname, bool create,
-                                        const std::string *append) {
-#if defined(WEBRTC_ANDROID) || defined(WEBRTC_MAC)
-  RTC_DCHECK(provided_app_temp_folder_ != nullptr);
-  pathname.SetPathname(provided_app_temp_folder_, "");
-#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  // defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
-  if (append) {
-    RTC_DCHECK(!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;