Revert 72380 - Remove wstring from autocomplete....

chrome/browser/autocomplete/history_quick_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 "chrome/browser/autocomplete/history_quick_provider.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <string>
@@ skipping 78 matching lines @@
   void TearDown() {
     provider_ = NULL;
   }
 
   // Fills test data into the history system.
   void FillData();
 
   // Runs an autocomplete query on |text| and checks to see that the returned
   // results' destination URLs match those provided. |expected_urls| does not
   // need to be in sorted order.
-  void RunTest(const string16 text,
+  void RunTest(const std::wstring text,
                std::vector<std::string> expected_urls,
                std::string expected_top_result);
 
   MessageLoopForUI message_loop_;
   BrowserThread ui_thread_;
   BrowserThread file_thread_;
 
   scoped_ptr<TestingProfile> profile_;
   HistoryService* history_service_;
 
@@ skipping 46 matching lines @@
   void operator()(const std::string& expected) {
     EXPECT_EQ(1U, matches_.erase(expected));
   }
 
   std::set<std::string> LeftOvers() const { return matches_; }
 
  private:
   std::set<std::string> matches_;
 };
 
-void HistoryQuickProviderTest::RunTest(const string16 text,
+void HistoryQuickProviderTest::RunTest(const std::wstring text,
                                        std::vector<std::string> expected_urls,
                                        std::string expected_top_result) {
   std::sort(expected_urls.begin(), expected_urls.end());
 
   MessageLoop::current()->RunAllPending();
-  AutocompleteInput input(text, string16(), false, false, true, false);
+  AutocompleteInput input(text, std::wstring(), false, false, true, false);
   provider_->Start(input, false);
   EXPECT_TRUE(provider_->done());
 
   ACMatches matches = provider_->matches();
   // If the number of expected and actual matches aren't equal then we need
   // test no further, but let's do anyway so that we know which URLs failed.
   EXPECT_EQ(expected_urls.size(), matches.size());
 
   // Verify that all expected URLs were found and that all found URLs
   // were expected.
   std::set<std::string> leftovers =
       for_each(expected_urls.begin(), expected_urls.end(),
                SetShouldContain(matches)).LeftOvers();
   EXPECT_TRUE(leftovers.empty());
 
   // See if we got the expected top scorer.
   if (!matches.empty()) {
     std::partial_sort(matches.begin(), matches.begin() + 1,
                       matches.end(), AutocompleteMatch::MoreRelevant);
     EXPECT_EQ(expected_top_result, matches[0].destination_url.spec());
   }
 }
 
 TEST_F(HistoryQuickProviderTest, SimpleSingleMatch) {
-  string16 text(ASCIIToUTF16("slashdot"));
+  std::wstring text(L"slashdot");
   std::string expected_url("http://slashdot.org/favorite_page.html");
   std::vector<std::string> expected_urls;
   expected_urls.push_back(expected_url);
   RunTest(text, expected_urls, expected_url);
 }
 
 TEST_F(HistoryQuickProviderTest, MultiMatch) {
-  string16 text(ASCIIToUTF16("foo"));
+  std::wstring text(L"foo");
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://foo.com/");
   expected_urls.push_back("http://foo.com/dir/");
   expected_urls.push_back("http://foo.com/dir/another/");
   expected_urls.push_back("http://foo.com/dir/another/again/");
   expected_urls.push_back("http://foo.com/dir/another/again/myfile.html");
   expected_urls.push_back("http://spaces.com/path%20with%20spaces/foo.html");
   RunTest(text, expected_urls, "http://foo.com/");
 }
 
 TEST_F(HistoryQuickProviderTest, StartRelativeMatch) {
-  string16 text(ASCIIToUTF16("xyz"));
+  std::wstring text(L"xyz");
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://xyzabcdefghijklmnopqrstuvw.com/a");
   expected_urls.push_back("http://abcxyzdefghijklmnopqrstuvw.com/a");
   expected_urls.push_back("http://abcdefxyzghijklmnopqrstuvw.com/a");
   expected_urls.push_back("http://abcdefghixyzjklmnopqrstuvw.com/a");
   expected_urls.push_back("http://abcdefghijklxyzmnopqrstuvw.com/a");
   RunTest(text, expected_urls, "http://xyzabcdefghijklmnopqrstuvw.com/a");
 }
 
 TEST_F(HistoryQuickProviderTest, RecencyMatch) {
-  string16 text(ASCIIToUTF16("startest"));
+  std::wstring text(L"startest");
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://startest.com/y/a");
   expected_urls.push_back("http://startest.com/y/b");
   expected_urls.push_back("http://startest.com/x/c");
   expected_urls.push_back("http://startest.com/x/d");
   expected_urls.push_back("http://startest.com/y/e");
   expected_urls.push_back("http://startest.com/y/f");
   RunTest(text, expected_urls, "http://startest.com/y/a");
 }