Remove UTF string conversion functions from the global namespace.

third_party/zlib/google/zip_internal.cc

 // Copyright (c) 2011 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.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 36 matching lines @@
     creation_disposition = OPEN_EXISTING;
     share_mode = FILE_SHARE_READ;
   } else if (mode & ZLIB_FILEFUNC_MODE_EXISTING) {
     desired_access = GENERIC_WRITE | GENERIC_READ;
     creation_disposition = OPEN_EXISTING;
   } else if (mode & ZLIB_FILEFUNC_MODE_CREATE) {
     desired_access = GENERIC_WRITE | GENERIC_READ;
     creation_disposition = CREATE_ALWAYS;
   }
 
-  base::string16 filename16 = UTF8ToUTF16(filename);
+  base::string16 filename16 = base::UTF8ToUTF16(filename);
   if ((filename != NULL) && (desired_access != 0)) {
     file = CreateFile(filename16.c_str(), desired_access, share_mode,
         NULL, creation_disposition, flags_and_attributes, NULL);
   }
 
   if (file == INVALID_HANDLE_VALUE)
     file = NULL;
 
   if (file != NULL) {
     WIN32FILE_IOWIN file_ret;
@@ skipping 239 matching lines @@
 zipFile OpenFdForZipping(int zip_fd, int append_flag) {
   zlib_filefunc_def zip_funcs;
   FillFdOpenFileFunc(&zip_funcs, zip_fd);
   // Passing dummy "fd" filename to zlib.
   return zipOpen2("fd", append_flag, NULL, &zip_funcs);
 }
 #endif
 
 }  // namespace internal
 }  // namespace zip