Remove UTF string conversion functions from the global namespace.

third_party/zlib/google/zip_reader.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 "third_party/zlib/google/zip_reader.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 21 matching lines @@
   original_size_ = raw_file_info.uncompressed_size;
 
   // Directory entries in zip files end with "/".
   is_directory_ = EndsWith(file_name_in_zip, "/", false);
 
   // Check the file name here for directory traversal issues.
   is_unsafe_ = file_path_.ReferencesParent();
 
   // We also consider that the file name is unsafe, if it's invalid UTF-8.
   base::string16 file_name_utf16;
-  if (!UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
-                   &file_name_utf16)) {
+  if (!base::UTF8ToUTF16(file_name_in_zip.data(), file_name_in_zip.size(),
+                         &file_name_utf16)) {
     is_unsafe_ = true;
   }
 
   // We also consider that the file name is unsafe, if it's absolute.
   // On Windows, IsAbsolute() returns false for paths starting with "/".
   if (file_path_.IsAbsolute() || StartsWithASCII(file_name_in_zip, "/", false))
     is_unsafe_ = true;
 
   // Construct the last modified time. The timezone info is not present in
   // zip files, so we construct the time as local time.
@@ skipping 253 matching lines @@
 }
 
 void ZipReader::Reset() {
   zip_file_ = NULL;
   num_entries_ = 0;
   reached_end_ = false;
   current_entry_info_.reset();
 }
 
 }  // namespace zip