Revert 71485 - Remove wstring from TemplateURL and friends....

chrome/browser/autocomplete/keyword_provider_unittest.cc

-// Copyright (c) 2011 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 "base/message_loop.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class KeywordProviderTest : public testing::Test {
  protected:
   template<class ResultType>
@@ skipping 14 matching lines @@
                int num_cases,
                ResultType AutocompleteMatch::* member);
 
  protected:
   scoped_refptr<KeywordProvider> kw_provider_;
   scoped_ptr<TemplateURLModel> model_;
 };
 
 void KeywordProviderTest::SetUp() {
   static const TemplateURLModel::Initializer kTestKeywordData[] = {
-    { "aa", "aa.com?foo=%s", "aa" },
-    { "aaaa", "http://aaaa/?aaaa=1&b=%s&c", "aaaa" },
-    { "aaaaa", "%s", "aaaaa" },
-    { "ab", "bogus URL %s", "ab" },
-    { "weasel", "weasel%sweasel", "weasel" },
-    { "www", " +%2B?=%sfoo ", "www" },
-    { "z", "%s=z", "z" },
+    { L"aa", "aa.com?foo=%s", L"aa" },
+    { L"aaaa", "http://aaaa/?aaaa=1&b=%s&c", L"aaaa" },
+    { L"aaaaa", "%s", L"aaaaa" },
+    { L"ab", "bogus URL %s", L"ab" },
+    { L"weasel", "weasel%sweasel", L"weasel" },
+    { L"www", " +%2B?=%sfoo ", L"www" },
+    { L"z", "%s=z", L"z" },
   };
 
   model_.reset(new TemplateURLModel(kTestKeywordData,
                                     arraysize(kTestKeywordData)));
   kw_provider_ = new KeywordProvider(NULL, model_.get());
 }
 
 void KeywordProviderTest::TearDown() {
   model_.reset();
   kw_provider_ = NULL;
@@ skipping 120 matching lines @@
     {L"z    \t",         1, {L"(Keyword: z)"}},
     {L"z   a   b   c++", 1, {L"(Keyword: z)"}},
   };
 
   RunTest<std::wstring>(description_cases, arraysize(description_cases),
                         &AutocompleteMatch::description);
 }
 
 TEST_F(KeywordProviderTest, AddKeyword) {
   TemplateURL* template_url = new TemplateURL();
-  string16 keyword(ASCIIToUTF16("foo"));
+  std::wstring keyword(L"foo");
   std::string url("http://www.google.com/foo?q={searchTerms}");
   template_url->SetURL(url, 0, 0);
   template_url->set_keyword(keyword);
-  template_url->set_short_name(ASCIIToUTF16("Test"));
+  template_url->set_short_name(L"Test");
   model_->Add(template_url);
   ASSERT_TRUE(template_url == model_->GetTemplateURLForKeyword(keyword));
 }
 
 TEST_F(KeywordProviderTest, RemoveKeyword) {
-  string16 url(ASCIIToUTF16("http://aaaa/?aaaa=1&b={searchTerms}&c"));
-  model_->Remove(model_->GetTemplateURLForKeyword(ASCIIToUTF16("aaaa")));
-  ASSERT_TRUE(model_->GetTemplateURLForKeyword(ASCIIToUTF16("aaaa")) == NULL);
+  std::wstring url(L"http://aaaa/?aaaa=1&b={searchTerms}&c");
+  model_->Remove(model_->GetTemplateURLForKeyword(L"aaaa"));
+  ASSERT_TRUE(model_->GetTemplateURLForKeyword(L"aaaa") == NULL);
 }