Porting in browser/webdata and template_url.

chrome/browser/template_url.cc

 // Copyright (c) 2006-2008 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/template_url.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
@@ skipping 84 matching lines @@
   std::wstring parameter(url->substr(start + 1, length));
   // Remove the parameter from the string.
   url->erase(start, end - start + 1);
   if (parameter == kSearchTermsParameter) {
     replacements->push_back(Replacement(SEARCH_TERMS, static_cast<int>(start)));
   } else if (parameter == kCountParameter) {
     if (!optional)
       url->insert(start, kDefaultCount);
   } else if (parameter == kStartIndexParameter) {
     if (!optional) {
-      wchar_t start_string[12];
-      if (swprintf_s(start_string, L"%d", index_offset_) <= 0)
-        return false;
-      url->insert(start, start_string);
+      url->insert(start, IntToWString(index_offset_));
     }
   } else if (parameter == kStartPageParameter) {
     if (!optional) {
-      wchar_t start_string[12];
-      if (swprintf_s(start_string, L"%d", page_offset_) <= 0)
-        return false;
-      url->insert(start, start_string);
+      url->insert(start, IntToWString(page_offset_));
     }
   } else if (parameter == kLanguageParameter) {
     replacements->push_back(Replacement(LANGUAGE, static_cast<int>(start)));
   } else if (parameter == kInputEncodingParameter) {
     replacements->push_back(Replacement(ENCODING, static_cast<int>(start)));
   } else if (parameter == kOutputEncodingParameter) {
     if (!optional)
       url->insert(start, kOutputEncodingType);
   } else if (parameter == kGoogleAcceptedSuggestionParameter) {
     replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION,
@@ skipping 74 matching lines @@
 }
 
 void TemplateURLRef::ParseHostAndSearchTermKey() const {
   std::wstring url_string = url_;
   ReplaceSubstringsAfterOffset(&url_string, 0, kGoogleBaseURLParameterFull,
                                GoogleBaseURLValue());
   ReplaceSubstringsAfterOffset(&url_string, 0,
                                kGoogleBaseSuggestURLParameterFull,
                                GoogleBaseSuggestURLValue());
 
-  GURL url(url_string);
+  GURL url(WideToUTF8(url_string));
   if (!url.is_valid())
     return;
 
   std::string query_string = url.query();
   if (query_string.empty())
     return;
 
   url_parse::Component query, key, value;
   query.len = static_cast<int>(query_string.size());
   while (url_parse::ExtractQueryKeyValue(query_string.c_str(), &query, &key,
@@ skipping 225 matching lines @@
 
 // Returns the value to use for replacements of type GOOGLE_BASE_SUGGEST_URL.
 // static
 std::wstring TemplateURLRef::GoogleBaseSuggestURLValue() {
   // The suggest base URL we want at the end is something like
   // "http://clients1.google.TLD/complete/".  The key bit we want from the
   // original Google base URL is the TLD.
 
   // Start with the Google base URL.
   const GURL base_url(google_base_url_ ?
-      GURL(*google_base_url_) : GoogleURLTracker::GoogleURL());
+      GURL(WideToUTF8(*google_base_url_)) : GoogleURLTracker::GoogleURL());
   DCHECK(base_url.is_valid());
 
   // Change "www." to "clients1." in the hostname.  If no "www." was found, just
   // prepend "clients1.".
   const std::string base_host(base_url.host());
   GURL::Replacements repl;
   const std::string suggest_host("clients1." +
       (base_host.compare(0, 4, "www.") ? base_host : base_host.substr(4)));
   repl.SetHostStr(suggest_host);
 
@@ skipping 88 matching lines @@
   return GURL();
 }
 
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
   if (autogenerate_keyword_)
     keyword_.clear();
 }