Header cleanup in base....

base/shared_memory_posix.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/shared_memory.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/platform_thread.h"
 #include "base/safe_strerror_posix.h"
-#include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 
 namespace base {
 
 namespace {
 // Paranoia. Semaphores and shared memory segments should live in different
 // namespaces, but who knows what's out there.
 const char kSemaphoreSuffix[] = "-sem";
 }
 
 SharedMemory::SharedMemory()
@@ skipping 98 matching lines @@
   // mem_name will be used for a filename; make sure it doesn't
   // contain anything which will confuse us.
   DCHECK(memname.find_first_of(L"/") == std::string::npos);
   DCHECK(memname.find_first_of(L"\0") == std::string::npos);
 
   FilePath temp_dir;
   if (file_util::GetShmemTempDir(&temp_dir) == false)
     return false;
 
   *path = temp_dir.AppendASCII("com.google.chrome.shmem." +
-                               WideToASCII(memname));
+                               WideToUTF8(memname));
   return true;
 }
 
 // Chromium mostly only use the unique/private shmem as specified by
 // "name == L"". The exception is in the StatsTable.
 // TODO(jrg): there is no way to "clean up" all unused named shmem if
 // we restart from a crash.  (That isn't a new problem, but it is a problem.)
 // In case we want to delete it later, it may be useful to save the value
 // of mem_filename after FilePathForMemoryName().
 bool SharedMemory::CreateOrOpen(const std::wstring &name,
@@ skipping 162 matching lines @@
 
 void SharedMemory::Unlock() {
   LockOrUnlockCommon(F_ULOCK);
 }
 
 SharedMemoryHandle SharedMemory::handle() const {
   return FileDescriptor(mapped_file_, false);
 }
 
 }  // namespace base