Renames the function CreateTemporaryFilename to CreateTemporaryFile and track...

base/file_util_win.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <time.h>
@@ skipping 427 matching lines @@
   std::wstring path_str(temp_path);
   TrimTrailingSeparator(&path_str);
   *path = FilePath(path_str);
   return true;
 }
 
 bool GetShmemTempDir(FilePath* path) {
   return GetTempDir(path);
 }
 
-bool CreateTemporaryFileName(FilePath* path) {
-  std::wstring temp_path, temp_file;
+bool CreateTemporaryFile(FilePath* path) {
+  FilePath temp_file;
 
-  if (!GetTempDir(&temp_path))
+  if (!GetTempDir(path))
     return false;
 
-  if (CreateTemporaryFileNameInDir(temp_path, &temp_file)) {
-    *path = FilePath(temp_file);
+  if (CreateTemporaryFileInDir(*path, &temp_file)) {
+    *path = temp_file;
     return true;
   }
 
   return false;
 }
 
 FILE* CreateAndOpenTemporaryShmemFile(FilePath* path) {
   return CreateAndOpenTemporaryFile(path);
 }
 
 // On POSIX we have semantics to create and open a temporary file
 // atomically.
 // TODO(jrg): is there equivalent call to use on Windows instead of
 // going 2-step?
 FILE* CreateAndOpenTemporaryFileInDir(const FilePath& dir, FilePath* path) {
-  std::wstring wstring_path;
-  if (!CreateTemporaryFileNameInDir(dir.value(), &wstring_path)) {
+  if (!CreateTemporaryFileInDir(dir, path)) {
     return NULL;
   }
-  *path = FilePath(wstring_path);
   // Open file in binary mode, to avoid problems with fwrite. On Windows
   // it replaces \n's with \r\n's, which may surprise you.
   // Reference: http://msdn.microsoft.com/en-us/library/h9t88zwz(VS.71).aspx
   return OpenFile(*path, "wb+");
 }
 
-bool CreateTemporaryFileNameInDir(const std::wstring& dir,
-                                  std::wstring* temp_file) {
+bool CreateTemporaryFileInDir(const FilePath& dir,
+                              FilePath* temp_file) {
   wchar_t temp_name[MAX_PATH + 1];
 
-  if (!GetTempFileName(dir.c_str(), L"", 0, temp_name))
+  if (!GetTempFileName(dir.value().c_str(), L"", 0, temp_name))
     return false;  // fail!
 
   DWORD path_len = GetLongPathName(temp_name, temp_name, MAX_PATH);
   if (path_len > MAX_PATH + 1 || path_len == 0)
     return false;  // fail!
 
-  temp_file->assign(temp_name, path_len);
+  std::wstring temp_file_str;
+  temp_file_str.assign(temp_name, path_len);
+  *temp_file = FilePath(temp_file_str);
   return true;
 }
 
 bool CreateNewTempDirectory(const FilePath::StringType& prefix,
                             FilePath* new_temp_path) {
   FilePath system_temp_dir;
   if (!GetTempDir(&system_temp_dir))
     return false;
 
   FilePath path_to_create;
@@ skipping 305 matching lines @@
     ::CloseHandle(file_mapping_);
   if (file_ != INVALID_HANDLE_VALUE)
     ::CloseHandle(file_);
 
   data_ = NULL;
   file_mapping_ = file_ = INVALID_HANDLE_VALUE;
   length_ = INVALID_FILE_SIZE;
 }
 
 }  // namespace file_util