Use 'icu::' namespace explicitly

base/string_util_icu.cc

 // Copyright (c) 2006-2008 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/string_util.h"
 
 #include <string.h>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 613 matching lines @@
 
   utf16->resize(actual_size);
   return true;
 }
 
 // Number formatting -----------------------------------------------------------
 
 namespace {
 
 struct NumberFormatSingletonTraits
-    : public DefaultSingletonTraits<NumberFormat> {
-  static NumberFormat* New() {
+    : public DefaultSingletonTraits<icu::NumberFormat> {
+  static icu::NumberFormat* New() {
     UErrorCode status = U_ZERO_ERROR;
-    NumberFormat* formatter = NumberFormat::createInstance(status);
+    icu::NumberFormat* formatter = icu::NumberFormat::createInstance(status);
     DCHECK(U_SUCCESS(status));
     return formatter;
   }
   // There's no ICU call to destroy a NumberFormat object other than
   // operator delete, so use the default Delete, which calls operator delete.
   // This can cause problems if a different allocator is used by this file than
   // by ICU.
 };
 
 }  // namespace
 
 std::wstring FormatNumber(int64 number) {
-  NumberFormat* number_format =
-      Singleton<NumberFormat, NumberFormatSingletonTraits>::get();
+  icu::NumberFormat* number_format =
+      Singleton<icu::NumberFormat, NumberFormatSingletonTraits>::get();
 
   if (!number_format) {
     // As a fallback, just return the raw number in a string.
     return StringPrintf(L"%lld", number);
   }
-  UnicodeString ustr;
+  icu::UnicodeString ustr;
   number_format->format(number, ustr);
 
 #if defined(WCHAR_T_IS_UTF16)
   return std::wstring(ustr.getBuffer(),
                       static_cast<std::wstring::size_type>(ustr.length()));
 #elif defined(WCHAR_T_IS_UTF32)
   wchar_t buffer[64];  // A int64 is less than 20 chars long,  so 64 chars
                        // leaves plenty of room for formating stuff.
   int length = 0;
   UErrorCode error = U_ZERO_ERROR;
@@ skipping 16 matching lines @@
   // This implementation is not so fast since it converts the text encoding
   // twice. Please feel free to file a bug if this function hurts the
   // performance of Chrome.
   DCHECK(IsStringUTF8(input));
   std::wstring input_wide = UTF8ToWide(input);
   std::wstring output_wide;
   TrimPositions result = TrimWhitespace(input_wide, positions, &output_wide);
   *output = WideToUTF8(output_wide);
   return result;
 }