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

chrome/browser/bookmarks/bookmark_utils.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 "chrome/browser/bookmarks/bookmark_utils.h"
 
 #include "app/clipboard/clipboard.h"
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/tree_node_iterator.h"
@@ skipping 169 matching lines @@
 // Returns true if |node|s title or url contains the strings in |words|.
 // |languages| argument is user's accept-language setting to decode IDN.
 bool DoesBookmarkContainWords(const BookmarkNode* node,
                               const std::vector<std::wstring>& words,
                               const std::wstring& languages) {
   return
       DoesBookmarkTextContainWords(
           l10n_util::ToLower(node->GetTitle()), words) ||
       DoesBookmarkTextContainWords(UTF8ToWide(node->GetURL().spec()), words) ||
       DoesBookmarkTextContainWords(net::FormatUrl(
-          node->GetURL(), languages, false, true, NULL, NULL), words);
+          node->GetURL(), languages, false, true, NULL, NULL, NULL), words);
 }
 
 }  // namespace
 
 namespace bookmark_utils {
 
 int num_urls_before_prompting = 15;
 
 int PreferredDropOperation(int source_operations, int operations) {
   int common_ops = (source_operations & operations);
@@ skipping 445 matching lines @@
     std::vector<std::pair<GURL, std::wstring> >* urls) {
   for (int i = 0; i < browser->tab_count(); ++i) {
     std::pair<GURL, std::wstring> entry;
     GetURLAndTitleToBookmark(browser->GetTabContentsAt(i), &(entry.first),
                              &(entry.second));
     urls->push_back(entry);
   }
 }
 
 }  // namespace bookmark_utils