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

chrome/browser/toolbar_model.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/toolbar_model.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ skipping 22 matching lines @@
                     prefs::kAcceptLanguages);
     NavigationEntry* entry = navigation_controller->GetActiveEntry();
     // We may not have a navigation entry yet
     if (!navigation_controller->tab_contents()->ShouldDisplayURL()) {
       // Explicitly hide the URL for this tab.
       url = GURL();
     } else if (entry) {
       url = entry->virtual_url();
     }
   }
-  return net::FormatUrl(url, languages, true, UnescapeRule::NORMAL, NULL, NULL);
+  return net::FormatUrl(url, languages, true, UnescapeRule::NORMAL, NULL, NULL,
+                        NULL);
 }
 
 ToolbarModel::SecurityLevel ToolbarModel::GetSecurityLevel() {
   if (input_in_progress_)  // When editing, assume no security style.
     return ToolbarModel::NORMAL;
 
   NavigationController* navigation_controller = GetNavigationController();
   if (!navigation_controller)  // We might not have a controller on init.
     return ToolbarModel::NORMAL;
 
@@ skipping 150 matching lines @@
     // Multiple errors.
     text->assign(l10n_util::GetString(IDS_SEVERAL_SSL_ERRORS));
     text->append(L"\n");
     for (int i = 0; i < error_count; ++i) {
       text->append(errors[i].short_description());
       if (i != error_count - 1)
         text->append(L"\n");
     }
   }
 }