Fix various problems with inline autocomplete and URLs that change length dur...

app/gfx/text_elider.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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 "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "googleurl/src/gurl.h"
@@ skipping 14 matching lines @@
 // TODO(pkasting): http://b/119635 This whole function gets
 // kerning/ligatures/etc. issues potentially wrong by assuming that the width of
 // a rendered string is always the sum of the widths of its substrings.  Also I
 // suspect it could be made simpler.
 std::wstring ElideUrl(const GURL& url,
                       const gfx::Font& font,
                       int available_pixel_width,
                       const std::wstring& languages) {
   // Get a formatted string and corresponding parsing of the url.
   url_parse::Parsed parsed;
-  std::wstring url_string =
-      net::FormatUrl(url, languages, true, UnescapeRule::SPACES, &parsed, NULL);
+  std::wstring url_string = net::FormatUrl(url, languages, true,
+      UnescapeRule::SPACES, &parsed, NULL, NULL);
   if (available_pixel_width <= 0)
     return url_string;
 
   // If non-standard or not file type, return plain eliding.
   if (!(url.SchemeIsFile() || url.IsStandard()))
     return ElideText(url_string, font, available_pixel_width);
 
   // Now start eliding url_string to fit within available pixel width.
   // Fist pass - check to see whether entire url_string fits.
   int pixel_width_url_string = font.GetStringWidth(url_string);
@@ skipping 279 matching lines @@
     }
     guess = (lo + hi) / 2;
   }
 
   return text.substr(0, lo) + kEllipsis;
 }
 
 SortedDisplayURL::SortedDisplayURL(const GURL& url,
                                    const std::wstring& languages) {
   std::wstring host;
-  net::AppendFormattedHost(url, languages, &host, NULL);
+  net::AppendFormattedHost(url, languages, &host, NULL, NULL);
   sort_host_ = WideToUTF16Hack(host);
   string16 host_minus_www = WideToUTF16Hack(net::StripWWW(host));
   url_parse::Parsed parsed;
   display_url_ = WideToUTF16Hack(net::FormatUrl(url, languages,
-      true, UnescapeRule::SPACES, &parsed, &prefix_end_));
+      true, UnescapeRule::SPACES, &parsed, &prefix_end_, NULL));
   if (sort_host_.length() > host_minus_www.length()) {
     prefix_end_ += sort_host_.length() - host_minus_www.length();
     sort_host_.swap(host_minus_www);
   }
 }
 
 int SortedDisplayURL::Compare(const SortedDisplayURL& other,
                               icu::Collator* collator) const {
   // Compare on hosts first. The host won't contain 'www.'.
   UErrorCode compare_status = U_ZERO_ERROR;
@@ skipping 37 matching lines @@
 string16 SortedDisplayURL::AfterHost() const {
   size_t slash_index = display_url_.find(sort_host_, prefix_end_);
   if (slash_index == string16::npos) {
     NOTREACHED();
     return string16();
   }
   return display_url_.substr(slash_index + sort_host_.length());
 }
 
 } // namespace gfx.