Remove wstring from TemplateURL and friends....

chrome/browser/search_engines/template_url_model_test_util.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/browser/search_engines/template_url_model_test_util.h"
 
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 66 matching lines @@
 };
 
 // Trivial subclass of TemplateURLModel that records the last invocation of
 // SetKeywordSearchTermsForURL.
 class TestingTemplateURLModel : public TemplateURLModel {
  public:
   explicit TestingTemplateURLModel(Profile* profile)
       : TemplateURLModel(profile) {
   }
 
-  std::wstring GetAndClearSearchTerm() {
-    std::wstring search_term;
+  string16 GetAndClearSearchTerm() {
+    string16 search_term;
     search_term.swap(search_term_);
     return search_term;
   }
 
  protected:
   virtual void SetKeywordSearchTermsForURL(const TemplateURL* t_url,
                                            const GURL& url,
-                                           const std::wstring& term) {
+                                           const string16& term) {
     search_term_ = term;
   }
 
  private:
-  std::wstring search_term_;
+  string16 search_term_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingTemplateURLModel);
 };
 
 void TemplateURLModelTestingProfile::SetUp() {
   db_thread_.Start();
 
   // Make unique temp directory.
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
 
@@ skipping 90 matching lines @@
 }
 
 void TemplateURLModelTestUtil::ResetModel(bool verify_load) {
   profile_->SetTemplateURLModel(new TestingTemplateURLModel(profile_.get()));
   model()->AddObserver(this);
   changed_count_ = 0;
   if (verify_load)
     VerifyLoad();
 }
 
-std::wstring TemplateURLModelTestUtil::GetAndClearSearchTerm() {
+string16 TemplateURLModelTestUtil::GetAndClearSearchTerm() {
   return
       static_cast<TestingTemplateURLModel*>(model())->GetAndClearSearchTerm();
 }
 
 void TemplateURLModelTestUtil::SetGoogleBaseURL(
     const std::string& base_url) const {
   TemplateURLRef::SetGoogleBaseURL(new std::string(base_url));
   NotificationService::current()->Notify(NotificationType::GOOGLE_URL_UPDATED,
                                          NotificationService::AllSources(),
                                          NotificationService::NoDetails());
 }
 
 WebDataService* TemplateURLModelTestUtil::GetWebDataService() {
   return profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
 }
 
 TemplateURLModel* TemplateURLModelTestUtil::model() const {
   return profile_->GetTemplateURLModel();
 }
 
 TestingProfile* TemplateURLModelTestUtil::profile() const {
   return profile_.get();
 }
 
 void TemplateURLModelTestUtil::StartIOThread() {
   profile_->StartIOThread();
 }