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 /extensions/common/csp_validator.cc | |
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 'extensions/common/csp_validator.cc')
-rw-r--r-- | extensions/common/csp_validator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/common/csp_validator.cc b/extensions/common/csp_validator.cc index 06ea4ef..a984e3d 100644 --- a/extensions/common/csp_validator.cc +++ b/extensions/common/csp_validator.cc @@ -297,7 +297,7 @@ std::string SanitizeContentSecurityPolicy( } } - return JoinString(sane_csp_parts, ' '); + return base::JoinString(sane_csp_parts, " "); } bool ContentSecurityPolicyIsSandboxed( |