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

chrome/browser/search_engines/template_url_model_test_util.h

-// 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_TEST_UTIL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_TEST_UTIL_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/string16.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/search_engines/template_url_model_observer.h"
 
 class TemplateURLModel;
 class TemplateURLModelTestingProfile;
 class TestingTemplateURLModel;
 class TestingProfile;
 class WebDataService;
 
 // Implements functionality to make it easier to test TemplateURLModel and
@@ skipping 38 matching lines @@
   void ChangeModelToLoadState();
 
   // Deletes the current model (and doesn't create a new one).
   void ClearModel();
 
   // Creates a new TemplateURLModel.
   void ResetModel(bool verify_load);
 
   // Returns the search term from the last invocation of
   // TemplateURLModel::SetKeywordSearchTermsForURL and clears the search term.
-  string16 GetAndClearSearchTerm();
+  std::wstring GetAndClearSearchTerm();
 
   // Set the google base url.
   void SetGoogleBaseURL(const std::string& base_url) const;
 
   // Returns the WebDataService.
   WebDataService* GetWebDataService();
 
   // Returns the TemplateURLModel.
   TemplateURLModel* model() const;
 
   // Returns the TestingProfile.
   TestingProfile* profile() const;
 
   // Starts an I/O thread.
   void StartIOThread();
 
  private:
   MessageLoopForUI message_loop_;
   // Needed to make the DeleteOnUIThread trait of WebDataService work
   // properly.
   BrowserThread ui_thread_;
   scoped_ptr<TemplateURLModelTestingProfile> profile_;
   scoped_ptr<TestingTemplateURLModel> model_;
   int changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLModelTestUtil);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_TEST_UTIL_H_