Revert of Move JoinString to the base namespace

content/browser/speech/google_one_shot_remote_engine.cc

 // Copyright (c) 2012 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 "content/browser/speech/google_one_shot_remote_engine.h"
 
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 187 matching lines @@
 
   if (!config_.hardware_info.empty())
     parts.push_back("xhw=" + net::EscapeQueryParamValue(config_.hardware_info,
                                                         true));
   parts.push_back("maxresults=" + base::UintToString(config_.max_hypotheses));
   parts.push_back(config_.filter_profanities ? "pfilter=2" : "pfilter=0");
 
   std::string api_key = google_apis::GetAPIKey();
   parts.push_back("key=" + net::EscapeQueryParamValue(api_key, true));
 
-  GURL url(std::string(kDefaultSpeechRecognitionUrl) +
-           base::JoinString(parts, "&"));
+  GURL url(std::string(kDefaultSpeechRecognitionUrl) + JoinString(parts, '&'));
 
   encoder_.reset(AudioEncoder::Create(kDefaultAudioCodec,
                                       config_.audio_sample_rate,
                                       config_.audio_num_bits_per_sample));
   DCHECK(encoder_.get());
   url_fetcher_ = net::URLFetcher::Create(url_fetcher_id_for_tests, url,
                                          net::URLFetcher::POST, this);
   url_fetcher_->SetChunkedUpload(encoder_->mime_type());
   url_fetcher_->SetRequestContext(url_context_.get());
   url_fetcher_->SetReferrer(config_.origin_url);
@@ skipping 68 matching lines @@
 
 bool GoogleOneShotRemoteEngine::IsRecognitionPending() const {
   return url_fetcher_ != NULL;
 }
 
 int GoogleOneShotRemoteEngine::GetDesiredAudioChunkDurationMs() const {
   return kAudioPacketIntervalMs;
 }
 
 }  // namespace content