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

chrome/browser/autocomplete/autocomplete_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/scoped_ptr.h"
 #include "base/string_number_conversions.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 158 matching lines @@
   TemplateURL* default_t_url = new TemplateURL();
   default_t_url->SetURL("http://defaultturl/{searchTerms}", 0, 0);
   TemplateURLModel* turl_model = profile_.GetTemplateURLModel();
   turl_model->Add(default_t_url);
   turl_model->SetDefaultSearchProvider(default_t_url);
   TemplateURLID default_provider_id = default_t_url->id();
   ASSERT_NE(0, default_provider_id);
 
   // Create another TemplateURL for KeywordProvider.
   TemplateURL* keyword_t_url = new TemplateURL();
-  keyword_t_url->set_short_name(ASCIIToUTF16("k"));
-  keyword_t_url->set_keyword(ASCIIToUTF16("k"));
+  keyword_t_url->set_short_name(L"k");
+  keyword_t_url->set_keyword(L"k");
   keyword_t_url->SetURL("http://keyword/{searchTerms}", 0, 0);
   profile_.GetTemplateURLModel()->Add(keyword_t_url);
   ASSERT_NE(0, keyword_t_url->id());
 
   // Forget about any existing providers.  The controller owns them and will
   // Release() them below, when we delete it during the call to reset().
   providers_.clear();
 
   // Create both a keyword and search provider, and add them in that order.
   // (Order is important; see comments in RunExactKeymatchTest().)
@@ skipping 257 matching lines @@
     EXPECT_EQ(input_cases[i].scheme.len, scheme.len) << "Input: " <<
         input_cases[i].input;
     EXPECT_EQ(input_cases[i].host.begin, host.begin) << "Input: " <<
         input_cases[i].input;
     EXPECT_EQ(input_cases[i].host.len, host.len) << "Input: " <<
         input_cases[i].input;
   }
 }
 
 }  // namespace