Revert 49982 - patch

base/string_util.h

 // 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.
 //
 // This file defines utility functions for working with strings.
 
 #ifndef BASE_STRING_UTIL_H_
 #define BASE_STRING_UTIL_H_
 
 #include <stdarg.h>   // va_list
@@ skipping 36 matching lines @@
 
 // vswprintf always null-terminates, but when truncation occurs, it will either
 // return -1 or the number of characters that would be in an untruncated
 // formatted string.  The actual return value depends on the underlying
 // C library's vswprintf implementation.
 int vswprintf(wchar_t* buffer, size_t size,
               const wchar_t* format, va_list arguments) WPRINTF_FORMAT(3, 0);
 
 // Some of these implementations need to be inlined.
 
-// CLANG NOTE
-// Qualified calls with base:: is to work around
-//   http://llvm.org/bugs/show_bug.cgi?id=6762
-
 // We separate the declaration from the implementation of this inline
 // function just so the PRINTF_FORMAT works.
 inline int snprintf(char* buffer, size_t size, const char* format, ...)
     PRINTF_FORMAT(3, 4);
 inline int snprintf(char* buffer, size_t size, const char* format, ...) {
   va_list arguments;
   va_start(arguments, format);
-  int result = base::vsnprintf(buffer, size, format, arguments);
+  int result = vsnprintf(buffer, size, format, arguments);
   va_end(arguments);
   return result;
 }
 
 // We separate the declaration from the implementation of this inline
 // function just so the WPRINTF_FORMAT works.
 inline int swprintf(wchar_t* buffer, size_t size, const wchar_t* format, ...)
     WPRINTF_FORMAT(3, 4);
 inline int swprintf(wchar_t* buffer, size_t size, const wchar_t* format, ...) {
   va_list arguments;
   va_start(arguments, format);
-  int result = base::vswprintf(buffer, size, format, arguments);
+  int result = vswprintf(buffer, size, format, arguments);
   va_end(arguments);
   return result;
 }
 
 // BSD-style safe and consistent string copy functions.
 // Copies |src| to |dst|, where |dst_size| is the total allocated size of |dst|.
 // Copies at most |dst_size|-1 characters, and always NULL terminates |dst|, as
 // long as |dst_size| is not 0.  Returns the length of |src| in characters.
 // If the return value is >= dst_size, then the output was truncated.
 // NOTE: All sizes are in number of characters, NOT in bytes.
@@ skipping 601 matching lines @@
 #elif defined(WCHAR_T_IS_UTF32)
   typedef uint32 Unsigned;
 #endif
 };
 template<>
 struct ToUnsigned<short> {
   typedef unsigned short Unsigned;
 };
 
 #endif  // BASE_STRING_UTIL_H_