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

chrome/browser/bookmarks/bookmark_table_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/bookmarks/bookmark_table_model.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
@@ skipping 305 matching lines @@
       l10n_util::AdjustStringForLocaleDirection(title, &title);
       return title;
     }
 
     case IDS_BOOKMARK_TABLE_URL: {
       if (!node->is_url())
         return std::wstring();
       std::wstring languages = model_ && model_->profile()
           ? model_->profile()->GetPrefs()->GetString(prefs::kAcceptLanguages)
           : std::wstring();
-      std::wstring url_text =
-          net::FormatUrl(node->GetURL(), languages, false, UnescapeRule::SPACES,
-          NULL, NULL);
+      std::wstring url_text = net::FormatUrl(node->GetURL(), languages, false,
+          UnescapeRule::SPACES, NULL, NULL, NULL);
       if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
         l10n_util::WrapStringWithLTRFormatting(&url_text);
       return url_text;
     }
 
     case IDS_BOOKMARK_TABLE_PATH: {
       std::wstring path;
       BuildPath(node->GetParent(), &path);
       // Force path to have LTR directionality. The whole path (but not every
       // single path component) is marked with LRE-PDF. For example,
@@ skipping 63 matching lines @@
     return;
   }
   if (node == model()->other_node()) {
     *path = l10n_util::GetString(IDS_BOOKMARK_TABLE_OTHER_BOOKMARKS_PATH);
     return;
   }
   BuildPath(node->GetParent(), path);
   path->append(l10n_util::GetString(IDS_BOOKMARK_TABLE_PATH_SEPARATOR));
   path->append(node->GetTitle());
 }