Remove wstring from TemplateURL and friends....

chrome/browser/search_engines/search_terms_data.h

Index: chrome/browser/search_engines/search_terms_data.h
===================================================================
--- chrome/browser/search_engines/search_terms_data.h	(revision 71791)
+++ chrome/browser/search_engines/search_terms_data.h	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/string16.h"
 
 // All data needed by TemplateURLRef::ReplaceSearchTerms which typically may
 // only be accessed on the UI thread.
@@ -28,7 +29,7 @@
 
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
   // Returns the value for the Chrome Omnibox rlz.
-  virtual std::wstring GetRlzParameterValue() const = 0;
+  virtual string16 GetRlzParameterValue() const = 0;
 #endif
 
  private:
@@ -44,7 +45,7 @@
   virtual std::string GoogleBaseURLValue() const;
   virtual std::string GetApplicationLocale() const;
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
-  virtual std::wstring GetRlzParameterValue() const;
+  virtual string16 GetRlzParameterValue() const;
 #endif
 
   // Used by tests to set the value for the Google base url. This takes