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

chrome/browser/autocomplete/autocomplete.h

-// 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 529 matching lines @@
   virtual ~AutocompleteProvider();
 
   // Trims "http:" and up to two subsequent slashes from |url|.  Returns the
   // number of characters that were trimmed.
   static size_t TrimHttpPrefix(std::wstring* url);
 
   // Updates the starred state of each of the matches in matches_ from the
   // profile's bookmark bar model.
   void UpdateStarredStateOfMatches();
 
-  // A convenience function to call gfx::GetCleanStringFromUrl() with the
-  // current set of "Accept Languages" when check_accept_lang is true.
-  // Otherwise, it's called with an empty list.
+  // A convenience function to call net::FormatUrl() with the current set of
+  // "Accept Languages" when check_accept_lang is true.  Otherwise, it's called
+  // with an empty list.
   std::wstring StringForURLDisplay(const GURL& url,
                                    bool check_accept_lang) const;
 
   // The profile associated with the AutocompleteProvider.  Reference is not
   // owned by us.
   Profile* profile_;
 
   ACProviderListener* listener_;
   ACMatches matches_;
   bool done_;
@@ skipping 316 matching lines @@
   AutocompleteInput::Type input_type;
   // Selected index (if selected) or -1 (AutocompletePopupModel::kNoMatch).
   size_t selected_index;
   // Inline autocompleted length (if displayed).
   size_t inline_autocompleted_length;
   // Result set.
   const AutocompleteResult& result;
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_H_