Replaces some TrimWhitespace with TrimWhitespaceASCII or TrimWhitespaceUTF8....

chrome/browser/net/url_fixer_upper.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 "chrome/browser/net/url_fixer_upper.h"
 
 #include <algorithm>
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
       UTF8ComponentToWideComponent(text_utf8, parts_utf8.query);
   parts->ref =
       UTF8ComponentToWideComponent(text_utf8, parts_utf8.ref);
 }
 
 }  // namespace
 
 // does some basic fixes for input that we want to test for file-ness
 static void PrepareStringForFileOps(const FilePath& text,
                                     FilePath::StringType* output) {
+#if defined(OS_WIN)
   TrimWhitespace(text.value(), TRIM_ALL, output);
-#if defined(OS_WIN)
   replace(output->begin(), output->end(), '/', '\\');
+#else
+  TrimWhitespaceUTF8(text.value(), TRIM_ALL, output);
 #endif
 }
 
 // Tries to create a full path from |text|.  If the result is valid and the
 // file exists, returns true and sets |full_path| to the result.  Otherwise,
 // returns false and leaves |full_path| unchanged.
 static bool ValidPathForFile(const FilePath::StringType& text,
                              FilePath* full_path) {
   FilePath file_path(text);
   if (!file_util::AbsolutePath(&file_path))
@@ skipping 332 matching lines @@
   OffsetComponent(offset, &parts->path);
   OffsetComponent(offset, &parts->query);
   OffsetComponent(offset, &parts->ref);
 
   return scheme;
 }
 
 string URLFixerUpper::FixupURL(const string& text,
                                const string& desired_tld) {
   string trimmed;
-  TrimWhitespace(text, TRIM_ALL, &trimmed);
+  TrimWhitespaceUTF8(text, TRIM_ALL, &trimmed);
   if (trimmed.empty())
     return string();  // Nothing here.
 
   // Segment the URL.
   url_parse::Parsed parts;
   string scheme(SegmentURL(trimmed, &parts));
 
   // We handle the file scheme separately.
   if (scheme == "file")
     return (parts.scheme.is_valid() ? text : FixupPath(text));
@@ skipping 103 matching lines @@
 }
 wstring URLFixerUpper::FixupURL(const wstring& text,
                                 const wstring& desired_tld) {
   return UTF8ToWide(FixupURL(WideToUTF8(text), WideToUTF8(desired_tld)));
 }
 wstring URLFixerUpper::FixupRelativeFile(const wstring& base_dir,
                                          const wstring& text) {
   return UTF8ToWide(FixupRelativeFile(FilePath::FromWStringHack(base_dir),
                                       FilePath::FromWStringHack(text)));
 }