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

chrome/browser/views/url_picker.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 "chrome/browser/views/url_picker.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
 #include "app/table_model_observer.h"
 #include "base/keyboard_codes.h"
@@ skipping 274 matching lines @@
   return true;
 }
 
 void UrlPicker::OnSelectionChanged() {
   int selection = url_table_->FirstSelectedRow();
   if (selection >= 0 && selection < url_table_model_->RowCount()) {
     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(selection), languages,
-        false, UnescapeRule::NONE, NULL, NULL);
+    std::wstring formatted = net::FormatUrl(url_table_model_->GetURL(selection),
+        languages, false, UnescapeRule::NONE, NULL, NULL, NULL);
     url_field_->SetText(formatted);
     if (title_field_)
       title_field_->SetText(url_table_model_->GetTitle(selection));
     GetDialogClientView()->UpdateDialogButtons();
   }
 }
 
 void UrlPicker::OnDoubleClick() {
   int selection = url_table_->FirstSelectedRow();
   if (selection >= 0 && selection < url_table_model_->RowCount()) {
     OnSelectionChanged();
     PerformModelChange();
     if (window())
       window()->Close();
   }
 }
 
 GURL UrlPicker::GetInputURL() const {
   return GURL(URLFixerUpper::FixupURL(url_field_->text(), L""));
 }