Move UTF16ToASCII, remove WideToASCII.

net/disk_cache/cache_util.cc

 // 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.
 
 #include "net/disk_cache/cache_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/location.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/threading/worker_pool.h"
 
 namespace {
 
 const int kMaxOldFolders = 100;
 
 // Returns a fully qualified name from path and name, using a given name prefix
 // and index number. For instance, if the arguments are "/foo", "bar" and 5, it
 // will return "/foo/old_bar_005".
@@ skipping 89 matching lines @@
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
   base::FilePath current_path = full_path.StripTrailingSeparators();
 
   base::FilePath path = current_path.DirName();
   base::FilePath name = current_path.BaseName();
 #if defined(OS_POSIX)
   std::string name_str = name.value();
 #elif defined(OS_WIN)
   // We created this file so it should only contain ASCII.
-  std::string name_str = WideToASCII(name.value());
+  std::string name_str = base::UTF16ToASCII(name.value());
 #endif
 
   base::FilePath to_delete = GetTempCacheName(path, name_str);
   if (to_delete.empty()) {
     LOG(ERROR) << "Unable to get another cache folder";
     return false;
   }
 
   if (!disk_cache::MoveCache(full_path, to_delete)) {
     LOG(ERROR) << "Unable to move cache folder " << full_path.value() << " to "
@@ skipping 17 matching lines @@
   // Limit cache size to somewhat less than kint32max to avoid potential
   // integer overflows in cache backend implementations.
   DCHECK(kDefaultCacheSize * 4 < kint32max);
   if (max_size > kDefaultCacheSize * 4)
     max_size = kDefaultCacheSize * 4;
 
   return implicit_cast<int32>(max_size);
 }
 
 }  // namespace disk_cache