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

Unified Diff: ui/message_center/views/bounded_label_unittest.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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 | « ui/message_center/views/bounded_label.cc ('k') | ui/message_center/views/group_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/views/bounded_label_unittest.cc
diff --git a/ui/message_center/views/bounded_label_unittest.cc b/ui/message_center/views/bounded_label_unittest.cc
index bdfb0aceeb63334b6172e900b2668acad66b8af3..3761b9f07eef0fc1a2dac9d7790ce60447746988 100644
--- a/ui/message_center/views/bounded_label_unittest.cc
+++ b/ui/message_center/views/bounded_label_unittest.cc
@@ -35,10 +35,10 @@ class BoundedLabelTest : public testing::Test {
// with an ellipses character (UTF8 "\xE2\x80\xA6") and returns a string16
// with the results. This allows test strings to be specified as ASCII const
// char* strings, making tests more readable and easier to write.
- string16 ToString(const char* string) {
- const string16 periods = UTF8ToUTF16("...");
- const string16 ellipses = UTF8ToUTF16("\xE2\x80\xA6");
- string16 result = UTF8ToUTF16(string);
+ base::string16 ToString(const char* string) {
+ const base::string16 periods = UTF8ToUTF16("...");
+ const base::string16 ellipses = UTF8ToUTF16("\xE2\x80\xA6");
+ base::string16 result = UTF8ToUTF16(string);
ReplaceSubstringsAfterOffset(&result, 0, periods, ellipses);
return result;
}
@@ -58,7 +58,7 @@ class BoundedLabelTest : public testing::Test {
}
// Exercise BounderLabel::GetWrappedText() using the fixture's test label.
- string16 GetWrappedText(int width) {
+ base::string16 GetWrappedText(int width) {
return label_->GetWrappedTextForTest(width, lines_);
}
@@ -71,7 +71,7 @@ class BoundedLabelTest : public testing::Test {
protected:
// Creates a label to test with. Returns this fixture, which can be used to
// test the newly created label using the exercise methods above.
- BoundedLabelTest& Label(string16 text, int lines) {
+ BoundedLabelTest& Label(base::string16 text, int lines) {
lines_ = lines;
label_.reset(new BoundedLabel(text, font_list_));
label_->SetLineLimit(lines_);
« no previous file with comments | « ui/message_center/views/bounded_label.cc ('k') | ui/message_center/views/group_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698