Fixes Issue 7377: Regression: Omnibox trims URL ending with 0x85 (Take 2)...

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 512 matching lines @@
   u_strToWCS(buffer, 64, &length, ustr.getBuffer(), ustr.length() , &error);
   if (U_FAILURE(error)) {
     NOTREACHED();
     // As a fallback, just return the raw number in a string.
     return StringPrintf(L"%lld", number);
   }
   return std::wstring(buffer, static_cast<std::wstring::size_type>(length));
 #endif  // defined(WCHAR_T_IS_UTF32)
 }
 
+TrimPositions TrimWhitespaceUTF8(const std::string& input,
+                                 TrimPositions positions,
+                                 std::string* output) {
+  // 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;
+}
+