GURL::Replacements methods accept a StringPiece instead of std::string&.

components/search_engines/template_url.cc

 // Copyright 2014 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 "components/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 10 matching lines @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/search_engines/search_engines_switches.h"
 #include "components/search_engines/search_terms_data.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
+#include "url/gurl.h"
 
 namespace {
 
 // The TemplateURLRef has any number of terms that need to be replaced. Each of
 // the terms is enclosed in braces. If the character preceeding the final
 // brace is a ?, it indicates the term is optional and can be replaced with
 // an empty string.
 const char kStartParameter = '{';
 const char kEndParameter = '}';
 const char kOptional = '?';
@@ skipping 1311 matching lines @@
   base::string16 encoded_terms;
   base::string16 encoded_original_query;
   EncodeSearchTerms(search_terms_args, true, &input_encoding,
                     &encoded_terms, &encoded_original_query);
 
   std::string old_params(
       (search_term_component == url::Parsed::REF) ? url.ref() : url.query());
   std::string new_params(old_params, 0, search_terms_position.begin);
   new_params += base::UTF16ToUTF8(search_terms_args.search_terms);
   new_params += old_params.substr(search_terms_position.end());
-  url::StdStringReplacements<std::string> replacements;
+  GURL::Replacements replacements;
   if (search_term_component == url::Parsed::REF)
     replacements.SetRefStr(new_params);
   else
     replacements.SetQueryStr(new_params);
   *result = url.ReplaceComponents(replacements);
   return true;
 }
 
 void TemplateURL::EncodeSearchTerms(
     const TemplateURLRef::SearchTermsArgs& search_terms_args,
@@ skipping 91 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }