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 /remoting/base | |
| 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 'remoting/base')
| -rw-r--r-- | remoting/base/capabilities.cc | 2 | ||||
| -rw-r--r-- | remoting/base/capabilities_unittest.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/remoting/base/capabilities.cc b/remoting/base/capabilities.cc index 1226492..4903aed 100644 --- a/remoting/base/capabilities.cc +++ b/remoting/base/capabilities.cc @@ -36,7 +36,7 @@ std::string IntersectCapabilities(const std::string& client_capabilities, base::STLSetIntersection<std::vector<std::string> >( client_caps, host_caps); - return JoinString(result, " "); + return base::JoinString(result, " "); } } // namespace remoting diff --git a/remoting/base/capabilities_unittest.cc b/remoting/base/capabilities_unittest.cc index 71dbd56..90c12a0 100644 --- a/remoting/base/capabilities_unittest.cc +++ b/remoting/base/capabilities_unittest.cc @@ -67,7 +67,7 @@ TEST(CapabilitiesTest, HasCapability) { base::SPLIT_WANT_NONEMPTY); do { EXPECT_EQ(data[i].result, - HasCapability(JoinString(caps, " "), data[i].key)); + HasCapability(base::JoinString(caps, " "), data[i].key)); } while (std::next_permutation(caps.begin(), caps.end())); } } @@ -98,7 +98,8 @@ TEST(CapabilitiesTest, Intersect) { data[i].left, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); do { EXPECT_EQ(data[i].result, - IntersectCapabilities(JoinString(caps, " "), data[i].right)); + IntersectCapabilities(base::JoinString(caps, " "), + data[i].right)); } while (std::next_permutation(caps.begin(), caps.end())); } } |