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

chrome/browser/gtk/options/url_picker_dialog_gtk.cc

 // 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 <gtk/gtk.h>
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "chrome/browser/gtk/options/url_picker_dialog_gtk.h"
@@ skipping 178 matching lines @@
 std::string UrlPickerDialogGtk::GetURLForPath(GtkTreePath* path) const {
   gint row = gtk_tree::GetTreeSortChildRowNumForPath(history_list_sort_, path);
   if (row < 0) {
     NOTREACHED();
     return std::string();
   }
   std::wstring languages =
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
   // Because the url_field_ is user-editable, we set the URL with
   // username:password and escaped path and query.
-  std::wstring formatted = net::FormatUrl(
-      url_table_model_->GetURL(row), languages,
-      false, UnescapeRule::NONE, NULL, NULL);
+  std::wstring formatted = net::FormatUrl(url_table_model_->GetURL(row),
+      languages, false, UnescapeRule::NONE, NULL, NULL, NULL);
   return WideToUTF8(formatted);
 }
 
 void UrlPickerDialogGtk::SetColumnValues(int row, GtkTreeIter* iter) {
   SkBitmap bitmap = url_table_model_->GetIcon(row);
   GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&bitmap);
   std::wstring title = url_table_model_->GetText(row, IDS_ASI_PAGE_COLUMN);
   std::wstring url = url_table_model_->GetText(row, IDS_ASI_URL_COLUMN);
   gtk_list_store_set(history_list_store_, iter,
                      COL_FAVICON, pixbuf,
@@ skipping 62 matching lines @@
     window->AddURL();
   }
   gtk_widget_destroy(window->dialog_);
 }
 
 // static
 void UrlPickerDialogGtk::OnWindowDestroy(GtkWidget* widget,
                                          UrlPickerDialogGtk* window) {
   MessageLoop::current()->DeleteSoon(FROM_HERE, window);
 }