Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1652)

Unified Diff: content/browser/speech/google_streaming_remote_engine.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/speech/google_one_shot_remote_engine.cc ('k') | content/child/websocket_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/speech/google_streaming_remote_engine.cc
diff --git a/content/browser/speech/google_streaming_remote_engine.cc b/content/browser/speech/google_streaming_remote_engine.cc
index fc8c6d242548b4d03b9215826b8d279f57843ec8..0082cec67d9eea74181a7958f89b57395bb3b20c 100644
--- a/content/browser/speech/google_streaming_remote_engine.cc
+++ b/content/browser/speech/google_streaming_remote_engine.cc
@@ -320,7 +320,7 @@ GoogleStreamingRemoteEngine::ConnectBothStreams(const FSMEventArgs&) {
downstream_args.push_back("output=pb");
GURL downstream_url(std::string(kWebServiceBaseUrl) +
std::string(kDownstreamUrl) +
- JoinString(downstream_args, '&'));
+ base::JoinString(downstream_args, "&"));
downstream_fetcher_ = URLFetcher::Create(
kDownstreamUrlFetcherIdForTesting, downstream_url, URLFetcher::GET, this);
@@ -372,7 +372,7 @@ GoogleStreamingRemoteEngine::ConnectBothStreams(const FSMEventArgs&) {
}
GURL upstream_url(std::string(kWebServiceBaseUrl) +
std::string(kUpstreamUrl) +
- JoinString(upstream_args, '&'));
+ base::JoinString(upstream_args, "&"));
upstream_fetcher_ = URLFetcher::Create(kUpstreamUrlFetcherIdForTesting,
upstream_url, URLFetcher::POST, this);
« no previous file with comments | « content/browser/speech/google_one_shot_remote_engine.cc ('k') | content/child/websocket_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698