Drop |languages| from {Format,Elide}Url* and IDNToUnicode

components/bookmarks/browser/bookmark_utils_unittest.cc

 // Copyright 2014 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 "components/bookmarks/browser/bookmark_utils.h"
 
 #include <stddef.h>
 #include <utility>
 #include <vector>
 
@@ skipping 76 matching lines @@
                                             0,
                                             ASCIIToUTF16("baz buz"),
                                             GURL("http://www.cnn.com"));
   const BookmarkNode* folder1 =
       model->AddFolder(model->other_node(), 0, ASCIIToUTF16("foo"));
   std::vector<const BookmarkNode*> nodes;
   QueryFields query;
   query.word_phrase_query.reset(new base::string16);
   // No nodes are returned for empty string.
   *query.word_phrase_query = ASCIIToUTF16("");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   EXPECT_TRUE(nodes.empty());
   nodes.clear();
 
   // No nodes are returned for space-only string.
   *query.word_phrase_query = ASCIIToUTF16("   ");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   EXPECT_TRUE(nodes.empty());
   nodes.clear();
 
   // Node "foo bar" and folder "foo" are returned in search results.
   *query.word_phrase_query = ASCIIToUTF16("foo");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(2U, nodes.size());
   EXPECT_TRUE(nodes[0] == folder1);
   EXPECT_TRUE(nodes[1] == node1);
   nodes.clear();
 
   // Ensure url matches return in search results.
   *query.word_phrase_query = ASCIIToUTF16("cnn");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node2);
   nodes.clear();
 
   // Ensure folder "foo" is not returned in more specific search.
   *query.word_phrase_query = ASCIIToUTF16("foo bar");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node1);
   nodes.clear();
 
   // Bookmark Bar and Other Bookmarks are not returned in search results.
   *query.word_phrase_query = ASCIIToUTF16("Bookmark");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a URL query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesUrl) {
   scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   model->AddFolder(model->other_node(), 0, ASCIIToUTF16("Folder"));
 
   std::vector<const BookmarkNode*> nodes;
   QueryFields query;
   query.url.reset(new base::string16);
   *query.url = ASCIIToUTF16("https://www.google.com/");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node1);
   nodes.clear();
 
   *query.url = ASCIIToUTF16("calendar");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 
   // Empty URL should not match folders.
   *query.url = ASCIIToUTF16("");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 }
 
 // Check exact matching against a title query.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesTitle) {
   scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   const BookmarkNode* folder1 =
       model->AddFolder(model->other_node(), 0, ASCIIToUTF16("Folder"));
 
   std::vector<const BookmarkNode*> nodes;
   QueryFields query;
   query.title.reset(new base::string16);
   *query.title = ASCIIToUTF16("Google");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node1);
   nodes.clear();
 
   *query.title = ASCIIToUTF16("Calendar");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(0U, nodes.size());
   nodes.clear();
 
   // Title should match folders.
   *query.title = ASCIIToUTF16("Folder");
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == folder1);
   nodes.clear();
 }
 
 // Check matching against a query with multiple predicates.
 TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
   scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
   const BookmarkNode* node1 = model->AddURL(model->other_node(),
                                             0,
                                             ASCIIToUTF16("Google"),
                                             GURL("https://www.google.com/"));
   model->AddURL(model->other_node(),
                 0,
                 ASCIIToUTF16("Google Calendar"),
                 GURL("https://www.google.com/calendar"));
 
   model->AddFolder(model->other_node(), 0, ASCIIToUTF16("Folder"));
 
   std::vector<const BookmarkNode*> nodes;
   QueryFields query;
 
   // Test all fields matching.
   query.word_phrase_query.reset(new base::string16(ASCIIToUTF16("www")));
   query.url.reset(new base::string16(ASCIIToUTF16("https://www.google.com/")));
   query.title.reset(new base::string16(ASCIIToUTF16("Google")));
-  GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+  GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == node1);
   nodes.clear();
 
   scoped_ptr<base::string16>* fields[] = {
     &query.word_phrase_query, &query.url, &query.title };
 
   // Test two fields matching.
   for (size_t i = 0; i < arraysize(fields); i++) {
     scoped_ptr<base::string16> original_value(fields[i]->release());
-    GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+    GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
     ASSERT_EQ(1U, nodes.size());
     EXPECT_TRUE(nodes[0] == node1);
     nodes.clear();
     fields[i]->reset(original_value.release());
   }
 
   // Test two fields matching with one non-matching field.
   for (size_t i = 0; i < arraysize(fields); i++) {
     scoped_ptr<base::string16> original_value(fields[i]->release());
     fields[i]->reset(new base::string16(ASCIIToUTF16("fjdkslafjkldsa")));
-    GetBookmarksMatchingProperties(model.get(), query, 100, string(), &nodes);
+    GetBookmarksMatchingProperties(model.get(), query, 100, &nodes);
     ASSERT_EQ(0U, nodes.size());
     nodes.clear();
     fields[i]->reset(original_value.release());
   }
 }
 
 // Copy and paste is not yet supported on iOS. http://crbug.com/228147
 #if !defined(OS_IOS)
 TEST_F(BookmarkUtilsTest, PasteBookmarkFromURL) {
   scoped_ptr<BookmarkModel> model(TestBookmarkClient::CreateModel());
@@ skipping 335 matching lines @@
   model->GetNodesByURL(url, &nodes);
   ASSERT_EQ(1u, nodes.size());
   EXPECT_TRUE(model->bookmark_bar_node()->empty());
   EXPECT_TRUE(model->other_node()->empty());
   EXPECT_TRUE(model->mobile_node()->empty());
   EXPECT_EQ(1, extra_node->child_count());
 }
 
 }  // namespace
 }  // namespace bookmarks