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

chrome/browser/search_engines/template_url_prepopulate_data_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/scoped_temp_dir.h"
 #include "base/scoped_vector.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_engine_type.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/theme_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 94 matching lines @@
 
   int version = TemplateURLPrepopulateData::GetDataVersion(&prefs);
   EXPECT_EQ(1, version);
 
   ScopedVector<TemplateURL> t_urls;
   size_t default_index;
   TemplateURLPrepopulateData::GetPrepopulatedEngines(
       &prefs, &(t_urls.get()), &default_index);
 
   ASSERT_EQ(1u, t_urls.size());
-  EXPECT_EQ(ASCIIToUTF16("foo"), t_urls[0]->short_name());
-  EXPECT_EQ(ASCIIToUTF16("fook"), t_urls[0]->keyword());
+  EXPECT_EQ(L"foo", t_urls[0]->short_name());
+  EXPECT_EQ(L"fook", t_urls[0]->keyword());
   EXPECT_EQ("foo.com", t_urls[0]->url()->GetHost());
   EXPECT_EQ("foi.com", t_urls[0]->GetFavIconURL().host());
   EXPECT_EQ(1u, t_urls[0]->input_encodings().size());
   EXPECT_EQ(1001, t_urls[0]->prepopulate_id());
   EXPECT_EQ(SEARCH_ENGINE_GOOGLE, t_urls[0]->search_engine_type());
   EXPECT_EQ(0, t_urls[0]->logo_id());
 }
 
 TEST_F(TemplateURLPrepopulateDataTest, SearchEngineFromOrigin) {
   UIThreadSearchTermsData search_terms_data;
@@ skipping 43 matching lines @@
   EXPECT_EQ(kNoSearchEngineLogo,
             TemplateURLPrepopulateData::GetSearchEngineLogo(bad_engine));
   GURL engine_with_logo("http://www.ask.com/");
   EXPECT_EQ(IDR_SEARCH_ENGINE_LOGO_ASK,
             TemplateURLPrepopulateData::GetSearchEngineLogo(engine_with_logo));
   GURL engine_no_logo("http://araby.com/");
   EXPECT_EQ(kNoSearchEngineLogo,
             TemplateURLPrepopulateData::GetSearchEngineLogo(engine_no_logo));
 
 }