From 0eabfa001ba06d3c66992b95b69a988ef0633992 Mon Sep 17 00:00:00 2001 From: brettw Date: Tue, 14 Jul 2015 15:42:19 -0700 Subject: 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} --- components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/proximity_auth') diff --git a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc index 7c07fc2..834e42a 100644 --- a/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc +++ b/components/proximity_auth/cryptauth/cryptauth_gcm_manager_impl.cc @@ -93,7 +93,7 @@ void CryptAuthGCMManagerImpl::OnMessage(const std::string& app_id, PA_LOG(INFO) << "GCM message received:\n" << " sender_id: " << message.sender_id << "\n" << " collapse_key: " << message.collapse_key << "\n" - << " data:\n " << JoinString(fields, "\n "); + << " data:\n " << base::JoinString(fields, "\n "); if (message.data.find(kRegistrationTickleTypeKey) == message.data.end()) { PA_LOG(WARNING) << "GCM message does not contain 'registrationTickleType'."; -- cgit v1.1