Remove wstrings in bookmarks, part 10.

chrome/browser/bookmarks/bookmark_utils_unittest.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "testing/gtest/include/gtest/gtest.h"
 
 #include "app/clipboard/scoped_clipboard_writer.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 
 typedef testing::Test BookmarkUtilsTest;
 
 TEST_F(BookmarkUtilsTest, GetBookmarksContainingText) {
   BookmarkModel model(NULL);
   const BookmarkNode* n1 =
       model.AddURL(model.other_node(), 0, ASCIIToUTF16("foo bar"),
                    GURL("http://www.google.com"));
   const BookmarkNode* n2 =
       model.AddURL(model.other_node(), 0, ASCIIToUTF16("baz buz"),
                    GURL("http://www.cnn.com"));
 
   model.AddGroup(model.other_node(), 0, ASCIIToUTF16("foo"));
 
   std::vector<const BookmarkNode*> nodes;
   bookmark_utils::GetBookmarksContainingText(
-      &model, L"foo", 100, std::wstring(), &nodes);
+      &model, ASCIIToUTF16("foo"), 100, std::wstring(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == n1);
   EXPECT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      n1, L"foo", std::wstring()));
+      n1, ASCIIToUTF16("foo"), std::wstring()));
   nodes.clear();
 
   bookmark_utils::GetBookmarksContainingText(
-      &model, L"cnn", 100, std::wstring(), &nodes);
+      &model, ASCIIToUTF16("cnn"), 100, std::wstring(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == n2);
   EXPECT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      n2, L"cnn", std::wstring()));
+      n2, ASCIIToUTF16("cnn"), std::wstring()));
   nodes.clear();
 
   bookmark_utils::GetBookmarksContainingText(
-      &model, L"foo bar", 100, std::wstring(), &nodes);
+      &model, ASCIIToUTF16("foo bar"), 100, std::wstring(), &nodes);
   ASSERT_EQ(1U, nodes.size());
   EXPECT_TRUE(nodes[0] == n1);
   EXPECT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      n1, L"foo bar", std::wstring()));
+      n1, ASCIIToUTF16("foo bar"), std::wstring()));
   nodes.clear();
 }
 
 TEST_F(BookmarkUtilsTest, DoesBookmarkContainText) {
   BookmarkModel model(NULL);
   const BookmarkNode* node = model.AddURL(model.other_node(), 0,
                                           ASCIIToUTF16("foo bar"),
                                           GURL("http://www.google.com"));
   // Matches to the title.
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"ar", std::wstring()));
+      node, ASCIIToUTF16("ar"), std::wstring()));
   // Matches to the URL
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"www", std::wstring()));
+      node, ASCIIToUTF16("www"), std::wstring()));
   // No match.
   ASSERT_FALSE(bookmark_utils::DoesBookmarkContainText(
-      node, L"cnn", std::wstring()));
+      node, ASCIIToUTF16("cnn"), std::wstring()));
 
   // Tests for a Japanese IDN.
-  const wchar_t* kDecodedIdn = L"\x30B0\x30FC\x30B0\x30EB";
+  const string16 kDecodedIdn = WideToUTF16(L"\x30B0\x30FC\x30B0\x30EB");
   node = model.AddURL(model.other_node(), 0, ASCIIToUTF16("foo bar"),
                       GURL("http://xn--qcka1pmc.jp"));
   // Unicode query doesn't match if languages have no "ja".
   ASSERT_FALSE(bookmark_utils::DoesBookmarkContainText(
       node, kDecodedIdn, L"en"));
   // Unicode query matches if languages have "ja".
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
       node, kDecodedIdn, L"ja"));
   // Punycode query also matches as ever.
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"qcka1pmc", L"ja"));
+      node, ASCIIToUTF16("qcka1pmc"), L"ja"));
 
   // Tests with various lower/upper case characters.
   node = model.AddURL(model.other_node(), 0, ASCIIToUTF16("FOO bar"),
                       GURL("http://www.google.com/search?q=ABC"));
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"foo", std::wstring()));
+      node, ASCIIToUTF16("foo"), std::wstring()));
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"Foo", std::wstring()));
+      node, ASCIIToUTF16("Foo"), std::wstring()));
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"FOO", std::wstring()));
+      node, ASCIIToUTF16("FOO"), std::wstring()));
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"google abc", std::wstring()));
+      node, ASCIIToUTF16("google abc"), std::wstring()));
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"google ABC", std::wstring()));
+      node, ASCIIToUTF16("google ABC"), std::wstring()));
   ASSERT_TRUE(bookmark_utils::DoesBookmarkContainText(
-      node, L"http://www.google.com/search?q=A", std::wstring()));
+      node, ASCIIToUTF16("http://www.google.com/search?q=A"), std::wstring()));
 }
 
 #if !defined(OS_MACOSX)
 TEST_F(BookmarkUtilsTest, CopyPaste) {
   // Clipboard requires a message loop.
   MessageLoopForUI loop;
 
   BookmarkModel model(NULL);
   const BookmarkNode* node = model.AddURL(model.other_node(), 0,
                                           ASCIIToUTF16("foo bar"),
@@ skipping 13 matching lines @@
     ScopedClipboardWriter clipboard_writer(g_browser_process->clipboard());
     clipboard_writer.WriteText(ASCIIToUTF16("foo"));
   }
 
   // Now we shouldn't be able to paste from the clipboard.
   EXPECT_FALSE(
       bookmark_utils::CanPasteFromClipboard(model.GetBookmarkBarNode()));
 }
 #endif