Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: remoting/base/capabilities_unittest.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/base/capabilities.cc ('k') | sql/recovery.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/capabilities_unittest.cc
diff --git a/remoting/base/capabilities_unittest.cc b/remoting/base/capabilities_unittest.cc
index 71dbd5641781397282be1e1ef9902fe616d2a107..90c12a0785088aa2c54745fea44bde7c6c17309e 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()));
}
}
« no previous file with comments | « remoting/base/capabilities.cc ('k') | sql/recovery.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698