diff options
| author | brettw <brettw@chromium.org> | 2015-07-14 15:42:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 22:43:54 +0000 |
| commit | 0eabfa001ba06d3c66992b95b69a988ef0633992 (patch) | |
| tree | a62a2b2c2e828f99ac192c41048e247fb0aa32da /google_apis | |
| parent | 28c7c11feb94dc2593e5a4bf2b7aeb9d15bd0e49 (diff) | |
| download | chromium_src-0eabfa001ba06d3c66992b95b69a988ef0633992.zip chromium_src-0eabfa001ba06d3c66992b95b69a988ef0633992.tar.gz chromium_src-0eabfa001ba06d3c66992b95b69a988ef0633992.tar.bz2 | |
Move JoinString to the base namespace.
Change "Separator" from string to StringPIece (most are constants). Remove char versions for symmetry with SplitString.
Update callers who pass empty separators to use a base::StringPiece()
Change chromecast/base/metrics/cast_metrics_helper.cc to not use JoinString at all and just append to the output (code is simpler and faster).
TBR=zelidrag@chromium.org for chromeos
Review URL: https://codereview.chromium.org/1223153003
Cr-Commit-Position: refs/heads/master@{#338762}
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/fake_gaia.cc | 2 | ||||
| -rw-r--r-- | google_apis/gaia/gaia_auth_util.cc | 3 | ||||
| -rw-r--r-- | google_apis/gaia/gaia_oauth_client.cc | 2 | ||||
| -rw-r--r-- | google_apis/gaia/oauth2_access_token_fetcher_impl.cc | 2 | ||||
| -rw-r--r-- | google_apis/gaia/oauth2_mint_token_flow.cc | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc index bbf5216..7c73dd8 100644 --- a/google_apis/gaia/fake_gaia.cc +++ b/google_apis/gaia/fake_gaia.cc @@ -708,7 +708,7 @@ void FakeGaia::HandleTokenInfo(const HttpRequest& request, response_dict.SetString("user_id", token_info->user_id); std::vector<std::string> scope_vector(token_info->scopes.begin(), token_info->scopes.end()); - response_dict.SetString("scope", JoinString(scope_vector, " ")); + response_dict.SetString("scope", base::JoinString(scope_vector, " ")); response_dict.SetInteger("expires_in", token_info->expires_in); response_dict.SetString("email", token_info->email); FormatJSONResponse(response_dict, http_response); diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc index e9ec545..5464da6 100644 --- a/google_apis/gaia/gaia_auth_util.cc +++ b/google_apis/gaia/gaia_auth_util.cc @@ -36,7 +36,8 @@ std::string CanonicalizeEmailImpl(const std::string& email_address, base::RemoveChars(parts[0], ".", &parts[0]); } - std::string new_email = base::StringToLowerASCII(JoinString(parts, at)); + std::string new_email = base::StringToLowerASCII( + base::JoinString(parts, "@")); VLOG(1) << "Canonicalized " << email_address << " to " << new_email; return new_email; } diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc index 14c3cc3..c021623 100644 --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc @@ -137,7 +137,7 @@ void GaiaOAuthClient::Core::RefreshToken( "&grant_type=refresh_token"; if (!scopes.empty()) { - std::string scopes_string = JoinString(scopes, ' '); + std::string scopes_string = base::JoinString(scopes, " "); post_body += "&scope=" + net::EscapeUrlEncodedData(scopes_string, true); } diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc index b513b78..1945c79 100644 --- a/google_apis/gaia/oauth2_access_token_fetcher_impl.cc +++ b/google_apis/gaia/oauth2_access_token_fetcher_impl.cc @@ -283,7 +283,7 @@ std::string OAuth2AccessTokenFetcherImpl::MakeGetAccessTokenBody( enc_client_secret.c_str(), enc_refresh_token.c_str()); } else { - std::string scopes_string = JoinString(scopes, ' '); + std::string scopes_string = base::JoinString(scopes, " "); return base::StringPrintf( kGetAccessTokenBodyWithScopeFormat, enc_client_id.c_str(), diff --git a/google_apis/gaia/oauth2_mint_token_flow.cc b/google_apis/gaia/oauth2_mint_token_flow.cc index 0316c63..c2a6501 100644 --- a/google_apis/gaia/oauth2_mint_token_flow.cc +++ b/google_apis/gaia/oauth2_mint_token_flow.cc @@ -167,7 +167,7 @@ std::string OAuth2MintTokenFlow::CreateApiCallBody() { net::EscapeUrlEncodedData(force_value, true).c_str(), net::EscapeUrlEncodedData(response_type_value, true).c_str(), net::EscapeUrlEncodedData( - JoinString(parameters_.scopes, ' '), true).c_str(), + base::JoinString(parameters_.scopes, " "), true).c_str(), net::EscapeUrlEncodedData(parameters_.client_id, true).c_str(), net::EscapeUrlEncodedData(parameters_.extension_id, true).c_str()); if (!parameters_.device_id.empty()) { |