diff options
author | brettw <brettw@chromium.org> | 2015-07-14 22:19:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 05:20:15 +0000 |
commit | d94a2214777c98910f946b6a15258618215545f4 (patch) | |
tree | d5ae23a49e50d06b187e122578a7856a36adbc2b /chromecast | |
parent | 65c576eee7276db9f003a553dd01970778d631ad (diff) | |
download | chromium_src-d94a2214777c98910f946b6a15258618215545f4.zip chromium_src-d94a2214777c98910f946b6a15258618215545f4.tar.gz chromium_src-d94a2214777c98910f946b6a15258618215545f4.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
Committed: https://crrev.com/0eabfa001ba06d3c66992b95b69a988ef0633992
Cr-Commit-Position: refs/heads/master@{#338762}
patch from issue 1223153003 at patchset 160001 (http://crrev.com/1223153003#ps160001)
BUG=
Review URL: https://codereview.chromium.org/1230243005
Cr-Commit-Position: refs/heads/master@{#338819}
Diffstat (limited to 'chromecast')
-rw-r--r-- | chromecast/base/metrics/cast_metrics_helper.cc | 14 | ||||
-rw-r--r-- | chromecast/base/process_utils.cc | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/chromecast/base/metrics/cast_metrics_helper.cc b/chromecast/base/metrics/cast_metrics_helper.cc index 6d07b4a..218da4a 100644 --- a/chromecast/base/metrics/cast_metrics_helper.cc +++ b/chromecast/base/metrics/cast_metrics_helper.cc @@ -78,12 +78,14 @@ std::string CastMetricsHelper::EncodeAppInfoIntoMetricsName( const std::string& app_id, const std::string& session_id, const std::string& sdk_version) { - std::vector<std::string> parts; - parts.push_back(action_name); - parts.push_back(app_id); - parts.push_back(session_id); - parts.push_back(sdk_version); - return JoinString(parts, kMetricsNameAppInfoDelimiter); + std::string result(action_name); + result.push_back(kMetricsNameAppInfoDelimiter); + result.append(app_id); + result.push_back(kMetricsNameAppInfoDelimiter); + result.append(session_id); + result.push_back(kMetricsNameAppInfoDelimiter); + result.append(sdk_version); + return result; } // static diff --git a/chromecast/base/process_utils.cc b/chromecast/base/process_utils.cc index 523fb1c..9e379a0 100644 --- a/chromecast/base/process_utils.cc +++ b/chromecast/base/process_utils.cc @@ -17,7 +17,7 @@ bool GetAppOutput(const std::vector<std::string>& argv, std::string* output) { DCHECK(output); // Join the args into one string, creating the command. - std::string command = JoinString(argv, ' '); + std::string command = base::JoinString(argv, " "); // Open the process. FILE* fp = popen(command.c_str(), "r"); |