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

chrome/browser/search_engines/search_terms_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_terms_data.h"
 
 #include "base/logging.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/google/google_url_tracker.h"
@@ skipping 54 matching lines @@
     (*google_base_url_) : GoogleURLTracker::GoogleURL().spec();
 }
 
 std::string UIThreadSearchTermsData::GetApplicationLocale() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   return g_browser_process->GetApplicationLocale();
 }
 
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
-string16 UIThreadSearchTermsData::GetRlzParameterValue() const {
+std::wstring UIThreadSearchTermsData::GetRlzParameterValue() const {
   DCHECK(!BrowserThread::IsWellKnownThread(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
-  string16 rlz_string;
+  std::wstring rlz_string;
   // For organic brandcodes do not use rlz at all. Empty brandcode usually
   // means a chromium install. This is ok.
-  string16 brand;
-  // See http://crbug.com/62337 .
+  std::wstring brand;
+  // See http://crbug.com/62337.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   if (GoogleUpdateSettings::GetBrand(&brand) && !brand.empty() &&
       !GoogleUpdateSettings::IsOrganic(brand))
     RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string);
   return rlz_string;
 }
 #endif
 
 // static
 void UIThreadSearchTermsData::SetGoogleBaseURL(std::string* google_base_url) {
   delete google_base_url_;
   google_base_url_ = google_base_url;
 }