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

chrome/browser/search_engines/template_url_model_test_util.cc

Index: chrome/browser/search_engines/template_url_model_test_util.cc
===================================================================
--- chrome/browser/search_engines/template_url_model_test_util.cc	(revision 71499)
+++ chrome/browser/search_engines/template_url_model_test_util.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -85,8 +85,8 @@
       : TemplateURLModel(profile) {
   }
 
-  string16 GetAndClearSearchTerm() {
-    string16 search_term;
+  std::wstring GetAndClearSearchTerm() {
+    std::wstring search_term;
     search_term.swap(search_term_);
     return search_term;
   }
@@ -94,12 +94,12 @@
  protected:
   virtual void SetKeywordSearchTermsForURL(const TemplateURL* t_url,
                                            const GURL& url,
-                                           const string16& term) {
+                                           const std::wstring& term) {
     search_term_ = term;
   }
 
  private:
-  string16 search_term_;
+  std::wstring search_term_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingTemplateURLModel);
 };
@@ -210,7 +210,7 @@
     VerifyLoad();
 }
 
-string16 TemplateURLModelTestUtil::GetAndClearSearchTerm() {
+std::wstring TemplateURLModelTestUtil::GetAndClearSearchTerm() {
   return
       static_cast<TestingTemplateURLModel*>(model())->GetAndClearSearchTerm();
 }