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

chrome/browser/search_engines/search_provider_install_data.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 "chrome/browser/search_engines/search_provider_install_data.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
@@ skipping 17 matching lines @@
 
 // Implementation of SearchTermsData that may be used on the I/O thread.
 class IOThreadSearchTermsData : public SearchTermsData {
  public:
   explicit IOThreadSearchTermsData(std::string google_base_url);
 
   // Implementation of SearchTermsData.
   virtual std::string GoogleBaseURLValue() const;
   virtual std::string GetApplicationLocale() const;
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
-  virtual string16 GetRlzParameterValue() const {
+  virtual std::wstring GetRlzParameterValue() const {
     // This value doesn't matter for our purposes.
-    return string16();
+    return std::wstring();
   }
 #endif
 
  private:
   std::string google_base_url_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThreadSearchTermsData);
 };
 
 IOThreadSearchTermsData::IOThreadSearchTermsData(std::string google_base_url)
@@ skipping 246 matching lines @@
 void SearchProviderInstallData::NotifyLoaded() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   task_queue_.Run();
 
   // Since we expect this request to be rare, clear out the information. This
   // also keeps the responses current as the search providers change.
   provider_map_.reset();
   SetDefault(NULL);
 }