Convert Punycode domains to Unicode in URLs shown in the followings:...

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 "app/gfx/text_elider.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_file.h"
 #include "googleurl/src/url_parse.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
@@ skipping 95 matching lines @@
   if (filename.length() > 1 && filename[1] == '|')
     filename[1] = ':';
 #elif defined(OS_POSIX)
   FilePath input_path(text);
   PrepareStringForFileOps(input_path, &filename);
 #endif
 
   // Here, we know the input looks like a file.
   GURL file_url = net::FilePathToFileURL(FilePath(filename));
   if (file_url.is_valid()) {
-    return WideToUTF8(gfx::GetCleanStringFromUrl(file_url, std::wstring(),
-                                                 NULL, NULL));
+    return WideToUTF8(net::FormatUrl(file_url, std::wstring()));
   }
 
   // Invalid file URL, just return the input.
   return text;
 }
 
 // Checks |domain| to see if a valid TLD is already present.  If not, appends
 // |desired_tld| to the domain, and prepends "www." unless it's already present.
 // Then modifies |fixed_up_url| to reflect the changes.
 static void AddDesiredTLD(const string& desired_tld,
@@ skipping 378 matching lines @@
   }
 
   // Put back the current directory if we saved it.
   if (!base_dir.empty()) {
     file_util::SetCurrentDirectory(old_cur_directory);
   }
 
   if (is_file) {
     GURL file_url = net::FilePathToFileURL(full_path);
     if (file_url.is_valid())
-      return WideToUTF8(gfx::GetCleanStringFromUrl(file_url, std::wstring(),
-                                                   NULL, NULL));
+      return WideToUTF8(net::FormatUrl(file_url, std::wstring()));
     // Invalid files fall through to regular processing.
   }
 
   // Fall back on regular fixup for this input.
 #if defined(OS_WIN)
   string text_utf8 = WideToUTF8(text.value());
 #elif defined(OS_POSIX)
   string text_utf8 = text.value();
 #endif
   return FixupURL(text_utf8, "");
@@ skipping 10 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)));
 }