Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/history_contents_provider_unittest.cc

 // 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 "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 82 matching lines @@
     // We must quit the message loop (if running) to return control to the test.
     // Note, calling Quit() directly will checkfail if the loop isn't running,
     // so we post a task, which is safe for either case.
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   }
 
   MessageLoopForUI message_loop_;
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
 
+  std::wstring history_dir_;
+
   scoped_ptr<TestingProfile> profile_;
   scoped_refptr<HistoryContentsProvider> provider_;
 };
 
 TEST_F(HistoryContentsProviderTest, Body) {
-  AutocompleteInput input(ASCIIToUTF16("FOO"), string16(), true, false, true,
-                          false);
+  AutocompleteInput input(L"FOO", std::wstring(), true, false, true, false);
   RunQuery(input, false);
 
   // The results should be the first two pages, in decreasing order.
   const ACMatches& m = matches();
   ASSERT_EQ(2U, m.size());
   EXPECT_EQ(test_entries[0].url, m[0].destination_url.spec());
-  EXPECT_STREQ(test_entries[0].title, UTF16ToUTF8(m[0].description).c_str());
+  EXPECT_STREQ(test_entries[0].title, WideToUTF8(m[0].description).c_str());
   EXPECT_EQ(test_entries[1].url, m[1].destination_url.spec());
-  EXPECT_STREQ(test_entries[1].title, UTF16ToUTF8(m[1].description).c_str());
+  EXPECT_STREQ(test_entries[1].title, WideToUTF8(m[1].description).c_str());
 }
 
 TEST_F(HistoryContentsProviderTest, Title) {
-  AutocompleteInput input(ASCIIToUTF16("PAGEONE"), string16(), true, false,
-                          true, false);
+  AutocompleteInput input(L"PAGEONE", std::wstring(), true, false, true, false);
   RunQuery(input, false);
 
   // The results should be the first two pages.
   const ACMatches& m = matches();
   ASSERT_EQ(2U, m.size());
   EXPECT_EQ(test_entries[0].url, m[0].destination_url.spec());
-  EXPECT_STREQ(test_entries[0].title, UTF16ToUTF8(m[0].description).c_str());
+  EXPECT_STREQ(test_entries[0].title, WideToUTF8(m[0].description).c_str());
   EXPECT_EQ(test_entries[1].url, m[1].destination_url.spec());
-  EXPECT_STREQ(test_entries[1].title, UTF16ToUTF8(m[1].description).c_str());
+  EXPECT_STREQ(test_entries[1].title, WideToUTF8(m[1].description).c_str());
 }
 
 // The "minimal changes" flag should mean that we don't re-query the DB.
 TEST_F(HistoryContentsProviderTest, MinimalChanges) {
   // A minimal changes request when there have been no real queries should
   // give us no results.
-  AutocompleteInput sync_input(ASCIIToUTF16("PAGEONE"), string16(), true, false,
-                               true, true);
+  AutocompleteInput sync_input(L"PAGEONE", std::wstring(), true, false, true,
+                               true);
   RunQuery(sync_input, true);
   const ACMatches& m1 = matches();
   EXPECT_EQ(0U, m1.size());
 
   // Now do a "regular" query to get the results.
-  AutocompleteInput async_input(ASCIIToUTF16("PAGEONE"), string16(), true,
-                                false, true, false);
+  AutocompleteInput async_input(L"PAGEONE", std::wstring(), true, false, true,
+                                false);
   RunQuery(async_input, false);
   const ACMatches& m2 = matches();
   EXPECT_EQ(2U, m2.size());
 
   // Now do a minimal one where we want synchronous results, and the results
   // should still be there.
   RunQuery(sync_input, true);
   const ACMatches& m3 = matches();
   EXPECT_EQ(2U, m3.size());
 }
 
 // Tests that the BookmarkModel is queried correctly.
 TEST_F(HistoryContentsProviderTest, Bookmarks) {
   profile()->CreateBookmarkModel(false);
   profile()->BlockUntilBookmarkModelLoaded();
 
   // Add a bookmark.
   GURL bookmark_url("http://www.google.com/4");
   profile()->GetBookmarkModel()->SetURLStarred(bookmark_url,
                                                ASCIIToUTF16("bar"), true);
 
   // Ask for synchronous. This should only get the bookmark.
-  AutocompleteInput sync_input(ASCIIToUTF16("bar"), string16(), true, false,
-                               true, true);
+  AutocompleteInput sync_input(L"bar", std::wstring(), true, false, true, true);
   RunQuery(sync_input, false);
   const ACMatches& m1 = matches();
   ASSERT_EQ(1U, m1.size());
   EXPECT_EQ(bookmark_url, m1[0].destination_url);
-  EXPECT_EQ(ASCIIToUTF16("bar"), m1[0].description);
+  EXPECT_EQ(L"bar", m1[0].description);
   EXPECT_TRUE(m1[0].starred);
 
   // Ask for async. We should get the bookmark immediately.
-  AutocompleteInput async_input(ASCIIToUTF16("bar"), string16(), true, false,
-                                true, false);
+  AutocompleteInput async_input(L"bar", std::wstring(), true, false, true,
+                                false);
   provider()->Start(async_input, false);
   const ACMatches& m2 = matches();
   ASSERT_EQ(1U, m2.size());
   EXPECT_EQ(bookmark_url, m2[0].destination_url);
 
   // Run the message loop (needed for async history results).
   MessageLoop::current()->Run();
 
   // We should have two urls now, bookmark_url and http://www.google.com/3.
   const ACMatches& m3 = matches();
   ASSERT_EQ(2U, m3.size());
   if (bookmark_url == m3[0].destination_url) {
     EXPECT_EQ("http://www.google.com/3", m3[1].destination_url.spec());
   } else {
     EXPECT_EQ(bookmark_url, m3[1].destination_url);
     EXPECT_EQ("http://www.google.com/3", m3[0].destination_url.spec());
   }
 }
 
 // Tests that history is deleted properly.
 TEST_F(HistoryContentsProviderTest, DeleteMatch) {
-  AutocompleteInput input(ASCIIToUTF16("bar"), string16(), true, false, true,
-                          false);
+  AutocompleteInput input(L"bar", std::wstring(), true, false, true, false);
   RunQuery(input, false);
 
   // Query; the result should be the third page.
   const ACMatches& m = matches();
   ASSERT_EQ(1U, m.size());
   EXPECT_EQ(test_entries[2].url, m[0].destination_url.spec());
 
   // Now delete the match and ensure it was removed.
   provider()->DeleteMatch(m[0]);
   EXPECT_EQ(0U, matches().size());
 }
 
 // Tests deleting starred results from history, not affecting bookmarks/matches.
 TEST_F(HistoryContentsProviderTest, DeleteStarredMatch) {
   profile()->CreateBookmarkModel(false);
   profile()->BlockUntilBookmarkModelLoaded();
 
   // Bookmark a history item.
   GURL bookmark_url(test_entries[2].url);
   profile()->GetBookmarkModel()->SetURLStarred(bookmark_url,
                                                ASCIIToUTF16("bar"), true);
 
   // Get the match to delete its history
-  AutocompleteInput input(ASCIIToUTF16("bar"), string16(), true, false, true,
-                          false);
+  AutocompleteInput input(L"bar", std::wstring(), true, false, true, false);
   RunQuery(input, false);
   const ACMatches& m = matches();
   ASSERT_EQ(1U, m.size());
 
   // Now delete the match and ensure it was *not* removed.
   provider()->DeleteMatch(m[0]);
   EXPECT_EQ(1U, matches().size());
 
   // Run a query that would only match history (but the history is deleted)
-  AutocompleteInput you_input(ASCIIToUTF16("you"), string16(), true, false,
-                              true, false);
+  AutocompleteInput you_input(L"you", std::wstring(), true, false, true, false);
   RunQuery(you_input, false);
   EXPECT_EQ(0U, matches().size());
 
   // Run a query that matches the bookmark
   RunQuery(input, false);
   EXPECT_EQ(1U, matches().size());
 }
 
 }  // namespace