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

chrome/browser/search_engines/template_url_parser_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/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_parser.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TemplateURLParserTest : public testing::Test {
  public:
   TemplateURLParserTest() : parse_result_(true) {
   }
 
@@ skipping 59 matching lines @@
     return;
   ParseFile("post.xml", NULL);
   EXPECT_FALSE(parse_result_);
 }
 
 TEST_F(TemplateURLParserTest, TestDictionary) {
   if (IsDisabled())
     return;
   ParseFile("dictionary.xml", NULL);
   ASSERT_TRUE(parse_result_);
-  EXPECT_EQ(ASCIIToUTF16("Dictionary.com"), template_url_.short_name());
+  EXPECT_EQ(L"Dictionary.com", template_url_.short_name());
   EXPECT_TRUE(template_url_.GetFavIconURL() ==
               GURL("http://cache.lexico.com/g/d/favicon.ico"));
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ(template_url_.url()->url(),
             "http://dictionary.reference.com/browse/{searchTerms}?r=75");
 }
 
 TEST_F(TemplateURLParserTest, TestMSDN) {
   if (IsDisabled())
     return;
   ParseFile("msdn.xml", NULL);
   ASSERT_TRUE(parse_result_);
-  EXPECT_EQ(ASCIIToUTF16("Search \" MSDN"), template_url_.short_name());
+  EXPECT_EQ(L"Search \" MSDN", template_url_.short_name());
   EXPECT_TRUE(template_url_.GetFavIconURL() ==
               GURL("http://search.msdn.microsoft.com/search/favicon.ico"));
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ(template_url_.url()->url(),
             "http://search.msdn.microsoft.com/search/default.aspx?Query={searchTerms}&brand=msdn&locale=en-US");
 }
 
 TEST_F(TemplateURLParserTest, TestWikipedia) {
   if (IsDisabled())
     return;
   ParseFile("wikipedia.xml", NULL);
   ASSERT_TRUE(parse_result_);
-  EXPECT_EQ(ASCIIToUTF16("Wikipedia (English)"), template_url_.short_name());
+  EXPECT_EQ(L"Wikipedia (English)", template_url_.short_name());
   EXPECT_TRUE(template_url_.GetFavIconURL() ==
               GURL("http://en.wikipedia.org/favicon.ico"));
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ(template_url_.url()->url(),
       "http://en.wikipedia.org/w/index.php?title=Special:Search&search={searchTerms}");
   EXPECT_TRUE(template_url_.suggestions_url() != NULL);
   EXPECT_TRUE(template_url_.suggestions_url()->SupportsReplacement());
   EXPECT_EQ(template_url_.suggestions_url()->url(),
       "http://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}");
@@ skipping 30 matching lines @@
 };
 
 TEST_F(TemplateURLParserTest, TestFirefoxEbay) {
   if (IsDisabled())
     return;
   // This file uses the Parameter extension
   // (see http://www.opensearch.org/Specifications/OpenSearch/Extensions/Parameter/1.0)
   ParamFilterImpl filter("ebay", "ebay");
   ParseFile("firefox_ebay.xml", &filter);
   ASSERT_TRUE(parse_result_);
-  EXPECT_EQ(ASCIIToUTF16("eBay"), template_url_.short_name());
+  EXPECT_EQ(L"eBay", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   std::string exp_url =
       "http://search.ebay.com/search/search.dll?query={searchTerms}&"
       "MfcISAPICommand=GetResult&ht=1&srchdesc=n&maxRecordsReturned=300&"
       "maxRecordsPerPage=50&SortProperty=MetaEndSort";
   EXPECT_EQ(exp_url, template_url_.url()->url());
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("ISO-8859-1", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.ebay.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }
 
 TEST_F(TemplateURLParserTest, TestFirefoxWebster) {
   if (IsDisabled())
     return;
   // This XML file uses a namespace.
   ParamFilterImpl filter("", "Mozilla");
   ParseFile("firefox_webster.xml", &filter);
   ASSERT_TRUE(parse_result_);
-  EXPECT_EQ(ASCIIToUTF16("Webster"), template_url_.short_name());
+  EXPECT_EQ(L"Webster", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ("http://www.webster.com/cgi-bin/dictionary?va={searchTerms}",
             template_url_.url()->url());
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("ISO-8859-1", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://www.webster.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }
 
 TEST_F(TemplateURLParserTest, TestFirefoxYahoo) {
   if (IsDisabled())
     return;
   // This XML file uses a namespace.
   ParamFilterImpl filter("", "Mozilla");
   ParseFile("firefox_yahoo.xml", &filter);
   ASSERT_TRUE(parse_result_);
-  EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_.short_name());
+  EXPECT_EQ(L"Yahoo", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_EQ("http://ff.search.yahoo.com/gossip?"
             "output=fxjson&command={searchTerms}",
             template_url_.suggestions_url()->url());
   EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",
             template_url_.url()->url());
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }
 
 // Make sure we ignore POST suggestions (this is the same XML file as
 // firefox_yahoo.xml, the suggestion method was just changed to POST).
 TEST_F(TemplateURLParserTest, TestPostSuggestion) {
   if (IsDisabled())
     return;
   // This XML file uses a namespace.
   ParamFilterImpl filter("", "Mozilla");
   ParseFile("post_suggestion.xml", &filter);
   ASSERT_TRUE(parse_result_);
-  EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_.short_name());
+  EXPECT_EQ(L"Yahoo", template_url_.short_name());
   EXPECT_TRUE(template_url_.url() != NULL);
   EXPECT_TRUE(template_url_.url()->SupportsReplacement());
   EXPECT_TRUE(template_url_.suggestions_url() == NULL);
   EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",
             template_url_.url()->url());
   ASSERT_EQ(1U, template_url_.input_encodings().size());
   EXPECT_EQ("UTF-8", template_url_.input_encodings()[0]);
   EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
             template_url_.GetFavIconURL());
 }